viithiisys / Acufuel

Download as
Browse Code ยป

Commit 7e0d0bdd54761c8c026371c1f1bb09c234df1a78

Authored by Kuldeep Arora
1 parent dadb461173
Exists in master

update fuel order UI

Showing 3 changed files with 150 additions and 80 deletions   Show diff stats
app/partials/enterFuelOrder/enterFuelOrder.controller.js
Diff comments   View file @7e0d0bd
... ... @@ -115,7 +115,7 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http,
115 115 $scope.order.upliftDate = $scope.order.upliftDate + ' ' + hours + ':' + min + ':' + sec;
116 116 $scope.order.upliftDate = new Date($scope.order.upliftDate);
117 117 $scope.order.upliftDate = $scope.order.upliftDate.getTime();
118   - console.log("---date---",$scope.order.upliftDate)
  118 + // console.log("---date---",$scope.order.upliftDate)
119 119 }
120 120 /*if ($scope.order.departingDate != '') {
121 121 $scope.order.departingDate = new Date($scope.order.departingDate);
... ... @@ -124,11 +124,10 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http,
124 124  
125 125 $scope.order.status = 'pending';
126 126  
127   - //console.log($scope.order.quotePrice);
128 127 var obj =JSON.parse($scope.order.priceQuote);
129   - //console.log('obj.papMargin',obj.papMargin);
130 128 $scope.order.priceQuote = obj.papTotal;
131 129 $scope.order.fboCost = obj.cost;
  130 + $scope.order.productName = obj.productName;
132 131 $scope.order.total = obj.papTotal * $scope.order.volume;
133 132 var aircraftObj =JSON.parse($scope.order.aircraftName);
134 133 $scope.order.aircraftName = aircraftObj.tail;
... ...
app/partials/fuelOrders/fuelOrders.controller.js
Diff comments   View file @7e0d0bd
... ... @@ -110,16 +110,16 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
110 110  
111 111 $scope.getOrders = function() {
112 112 fuelOrdersService.getOrders().then(function(result) {
113   -
  113 + //console.log("==kd===",result);
114 114 $scope.orderdata = result;
115   - for(var i=0;i<$scope.orderdata.length;i++){
  115 + for(var i=0 ; i < $scope.orderdata.length ; i++){
116 116 $scope.orderdata[i].upliftDateS = new Date($scope.orderdata[i].upliftDate);
  117 + $scope.orderdata[i].departingDateS = new Date($scope.orderdata[i].departingDate);
117 118  
118   - // var str = "" + $scope.orderdata[i].upliftDateS.getDate() + "/" + ($scope.orderdata[i].upliftDateS.getMonth() + 1) + "/" + $scope.orderdata[i].upliftDateS.getFullYear()
119   - var str = "" + ($scope.orderdata[i].upliftDateS.getMonth() + 1) + "/" + $scope.orderdata[i].upliftDateS.getDate() + "/" + $scope.orderdata[i].upliftDateS.getFullYear()
120   - // str = str.slice(4,16)
121   - $scope.orderdata[i].upliftDateString = str
122   - // console.log(str);
  119 + var str = "" + ($scope.orderdata[i].upliftDateS.getMonth() + 1) + "/" + $scope.orderdata[i].upliftDateS.getDate() + "/" + $scope.orderdata[i].upliftDateS.getFullYear();
  120 + var departingStr = "" + ($scope.orderdata[i].departingDateS.getMonth() + 1) + "/" + $scope.orderdata[i].departingDateS.getDate() + "/" + $scope.orderdata[i].departingDateS.getFullYear();
  121 + $scope.orderdata[i].upliftDateString = str;
  122 + $scope.orderdata[i].departingDateString = departingStr;
123 123  
124 124 }
125 125  
... ... @@ -140,10 +140,8 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
140 140 for (var i = 0; i < myselect.length; i++) {
141 141 var colourIndex = $(myselect[i]).prop('selectedIndex');
142 142 colourIndex = colourIndex + 1;
143   - // console.log(colourIndex);
144 143 var getColor = $('.colorfulSelectbox option:nth-child('+colourIndex+')').css('color');
145 144 $(myselect[i]).css('background-color', getColor);
146   - // console.log('colour', getColor);
147 145 myselect[i].blur();
148 146 }
149 147 }
... ... @@ -190,9 +188,7 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
190 188  
191 189  
192 190 $scope.attachment = function(id, value, url) {
193   - // console.log(id, value)
194 191 $scope.attachmentrowid = id
195   - // $scope.attachmentdeleteid = attachdeleteid
196 192 if(value == 'uploadAttachment'){
197 193 $('#demo-modal-6').css('display', 'block');
198 194 }else if(value == 'viewAttachment'){
... ... @@ -210,7 +206,6 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
210 206 $scope.deleteAttachment = function() {
211 207 $scope.showLoader = true;
212 208 fuelOrdersService.deleteAttachment($scope.attachmentrowid).then(function(result) {
213   - // console.log(result, $scope.attachmentrowid)
214 209  
215 210 if(result.success){
216 211 toastr.success(''+result.success+'', {
... ... @@ -227,9 +222,7 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
227 222 $scope.data.media = attachmentData
228 223 $scope.data.id = $scope.attachmentrowid
229 224 fuelOrdersService.uploadAttachment($scope.data).then(function(result) {
230   - // console.log(result)
231 225 if(result){
232   - // console.log(result.success)
233 226 toastr.success(''+"Upload Successful"+'', {
234 227 closeButton: true
235 228 })
... ... @@ -273,7 +266,6 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
273 266 $scope.showLoader = true;
274 267  
275 268 if ($scope.order.priceQuote === null || $scope.order.priceQuote == '') {
276   - // console.log("valid");
277 269 $scope.showLoader = false;
278 270 toastr.error('Please select Company and Price Quote.', {
279 271 closeButton: true
... ... @@ -288,9 +280,7 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
288 280 $scope.order.departingDate = new Date($scope.order.departingDate);
289 281 $scope.order.departingDate = $scope.order.departingDate.getTime();
290 282 }
291   - // console.log($scope.order.quotePrice);
292 283 var obj =JSON.parse($scope.order.priceQuote);
293   - // console.log('obj.papMargin',obj.papMargin);
294 284 $scope.order.priceQuote = obj.papMargin;
295 285  
296 286 $scope.fuelData = {};
... ... @@ -312,11 +302,7 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
312 302  
313 303  
314 304 $scope.dispatchOrder.fuelOrderList.push($scope.fuelData);
315   - // console.log('$scope.order', $scope.dispatchOrder);
316 305 fuelOrdersService.dispathFuelOrder($scope.dispatchOrder).then(function(result) {
317   - //console.log("fuel data---",$scope.fuelData)
318   - //console.log("oder data",$scope.dispatchOrder)
319   - //console.log('result', result);
320 306 $scope.showLoader = false;
321 307 $scope.order = {};
322 308 $scope.dispatchOrder.fuelOrderList = [];
... ... @@ -350,7 +336,6 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
350 336  
351 337 $scope.dispatchOrder.fuelOrderList.push($scope.fuelData);
352 338 fuelOrdersService.updateFuelOrder($scope.dispatchOrder).then(function(result) {
353   - // console.log('result', result);
354 339 $scope.showLoader = false;
355 340 $scope.editdata = {};
356 341 $scope.fuelData = {};
... ... @@ -365,51 +350,67 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
365 350 }
366 351  
367 352 $scope.updateData = function() {
368   - $scope.showLoader = true;
369   - $scope.fuelData = {};
370   - $scope.fuelData.aircraftName = $scope.editdata.aircraftName
371   - $scope.fuelData.companyName = $scope.editdata.companyName
372   - $scope.fuelData.departingDate = $scope.editdata.departingDate
373   - $scope.fuelData.fboCost = $scope.editdata.fboCost
374   - $scope.fuelData.id = $scope.editdata.id
375   - $scope.fuelData.invoiced = $scope.editdata.invoiced
376   - $scope.fuelData.priceQuote = $scope.editdata.priceQuote
377   - $scope.fuelData.volume = $scope.editdata.requestedVolume
378   - $scope.fuelData.source = $scope.editdata.source
379   - $scope.fuelData.status = $scope.editdata.status
380   - $scope.fuelData.tierBreak = $scope.editdata.tierBreak
381   - $scope.fuelData.total = $scope.editdata.total
382   -
383   - $scope.editdata.upliftDateString = new Date($scope.editdata.upliftDateString);
384   - $scope.editdata.upliftDateString = $scope.editdata.upliftDateString.getTime();
385   -
386   - $scope.fuelData.upliftDate = $scope.editdata.upliftDateString
387 353  
388   - $scope.dispatchOrder.fuelOrderList.push($scope.fuelData);
389   - console.log("click-====",$scope.dispatchOrder)
390   - fuelOrdersService.updateFuelOrder($scope.dispatchOrder).then(function(result) {
391   - console.log('result', result);
392   - $scope.showLoader = false;
393   - $scope.editdata = {};
394   - $('#demo-modal-5').css('display', '');
395   - $scope.getOrders();
396   - toastr.success('Fuel Order Updated Successfully', {
397   - closeButton: true
398   - })
399   - })
  354 + if($scope.etaTimeList.length == 8 && $scope.etdTimeList.length ==8){
  355 + $scope.showLoader = true;
  356 + $scope.fuelData = {};
  357 + $scope.fuelData.aircraftName = $scope.editdata.aircraftName;
  358 + $scope.fuelData.companyName = $scope.editdata.companyName;
  359 + $scope.fuelData.fboCost = $scope.editdata.fboCost;
  360 + $scope.fuelData.id = $scope.editdata.id;
  361 + $scope.fuelData.invoiced = $scope.editdata.invoiced;
  362 + $scope.fuelData.priceQuote = $scope.editdata.priceQuote;
  363 + $scope.fuelData.volume = $scope.editdata.requestedVolume;
  364 + $scope.fuelData.source = $scope.editdata.source;
  365 + $scope.fuelData.status = $scope.editdata.status;
  366 + $scope.fuelData.tierBreak = $scope.editdata.tierBreak;
  367 + $scope.fuelData.total = $scope.editdata.total;
  368 +
  369 + $scope.editdata.upliftDateString = new Date($scope.editdata.upliftDateString);
  370 + $scope.editdata.upliftDateString = $scope.editdata.upliftDateString.getTime();
  371 +
  372 + $scope.editdata.departingDateString = new Date($scope.editdata.departingDateString);
  373 + $scope.editdata.departingDateString = $scope.editdata.departingDateString.getTime();
  374 +
  375 + $scope.fuelData.upliftDate = $scope.editdata.upliftDateString;
  376 + $scope.fuelData.departingDate = $scope.editdata.departingDateString;
  377 + $scope.fuelData.productName = $scope.editdata.productName;
  378 + $scope.fuelData.etaTime = $scope.etaTimeList;
  379 + $scope.fuelData.etdTime = $scope.etdTimeList;
  380 + $scope.fuelData.certificateType = $scope.editdata.certificateType;
  381 +
  382 + $scope.dispatchOrder.fuelOrderList.push($scope.fuelData);
  383 +
  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
  393 + })
  394 + })
  395 +
  396 + }else
  397 + {
  398 + toastr.error('Please select Arrival Time and Departure time both.', {
  399 + closeButton: true
  400 + })
  401 + }
  402 +
400 403 }
401 404  
402 405 $scope.getAircraft = function(company){
403 406  
404 407 $scope.selectedCompanyName = company;
405 408 //$scope.showLoader = true;
406   - // console.log("id",company)
407 409 for (var i = 0; i < $scope.companyList.length; i++) {
408 410 if ($scope.companyList[i].companyName == company) {
409 411 if($scope.companyList[i].margin != null && $scope.companyList[i].marginAVGAS != null){
410 412 fuelOrdersService.getFuelCost($scope.companyList[i].id).then(function(margins) {
411 413 $scope.marginList = margins;
412   - //console.log('$scope.marginList', $scope.marginList);
413 414 })
414 415 } else if ($scope.companyList[i].margin != null || $scope.companyList[i].marginAVGAS == null) {
415 416 fuelOrdersService.getATypeFuelPricing($scope.companyList[i].id).then(function(margins) {
... ... @@ -440,10 +441,8 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
440 441  
441 442 }
442 443 $scope.setCost = function(cost){
443   - console.log(cost);
444 444 if(cost != null) {
445 445 var obj =JSON.parse(cost);
446   - console.log("0bj",obj)
447 446 $scope.order.fboCost = obj.cost;
448 447 }
449 448  
... ... @@ -473,7 +472,6 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
473 472 CustomersService.getCompanyName().then(function(result) {
474 473 $scope.showLoader = true;
475 474 $scope.compNameList = result;
476   - //console.log("kd",result)
477 475 $scope.showLoader = false;
478 476 })
479 477 }
... ... @@ -482,7 +480,6 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
482 480 CustomersService.getJetMargin($scope.userProfileId).then(function(result) {
483 481 $scope.showLoader = true;
484 482 $scope.jetMarginList = result;
485   - //console.log("jet margin",result,$scope.userProfileId)
486 483 $scope.marginFilterOptions.push({
487 484 'id': '', 'title': 'Show All'
488 485 });
... ... @@ -497,7 +494,6 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
497 494  
498 495 CustomersService.getAvgMargin($scope.userProfileId).then(function(result) {
499 496 $scope.avgsMarginList = result;
500   - // console.log('avgsMarginList',result)
501 497 })
502 498  
503 499 $scope.showCompanyError = false;
... ... @@ -521,7 +517,6 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
521 517 function getData(){
522 518 $scope.showLoader = true;
523 519 CustomersService.getAircraftMake().then(function(result) {
524   - console.log("adadadsd==========")
525 520 $scope.aircraftMakeList = result;
526 521 $scope.showLoader = false;
527 522 })
... ... @@ -566,9 +561,7 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
566 561 $scope.aircraft = {};
567 562 $scope.getModal = function(makeId, index){
568 563 $scope.showLoader = true;
569   - //console.log(makeId)
570 564 $scope.aircraft.make = makeId;
571   - //var makeId = makeId;
572 565 CustomersService.getModal($scope.aircraft.make).then(function(result) {
573 566 $scope.showLoader = false;
574 567 $scope.aircraftDetails[index].aircraftModalList = result;
... ... @@ -633,7 +626,6 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
633 626  
634 627 //console.log("tail==============",tail, index)
635 628 ViewCompanyService.checkJetType(tail).then(function(result) {
636   - //console.log("result",result)
637 629 if(result.jetA == "true"){
638 630 $scope.jetShow[index] = false;
639 631 $scope.marginShow[index] = true;
... ... @@ -644,7 +636,23 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
644 636 })
645 637 }
646 638  
  639 + // $scope.etaTimeList=[];
  640 + // $scope.etdTimeList =[];
  641 +
647 642 $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},]
  649 +
  650 + $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 + {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 + {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 + {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 + {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"},]
648 656  
649 657 $scope.data = {};
650 658  
... ...
app/partials/fuelOrders/fuelOrders.html
Diff comments   View file @7e0d0bd
... ... @@ -737,15 +737,24 @@
737 737  
738 738 <div class="col-md-6">
739 739 <div class="pull-left" style="width: 110px;">
740   - <label class="new-input-label"><b>Fueling Date</b></label>
  740 + <label class="new-input-label" style="margin-top: 25px;"><b>ETA</b></label>
741 741 </div>
742   - <div class="pull-left" style="width: calc(100% - 110px);">
743   - <input type="text" ng-model="editdata.upliftDateString" class="form-control" placeholder="" datepicker/>
  742 + <div class="pull-left" style="width: calc(100% - 110px);">
  743 + <div style="width: 50%; float: left;">
  744 + Date
  745 + <input type="text" style="width: 90%;" ng-model="editdata.upliftDateString" class="form-control" placeholder="" datepicker/>
  746 + </div>
744 747 <!-- {{editdata.upliftDateString}} -->
  748 + <div style="width: 50%; float: left;">
  749 + Time
  750 + <select ui-select2 ng-model="etaTimeList" style="width: 90%;">
  751 + <option ng-repeat="li in etaTimeList">{{li.time}}</option>
  752 + </select>
  753 + </div>
745 754 </div>
746 755 <div class="clearfix"></div>
747 756 </div>
748   - <div class="col-md-6">
  757 + <div class="col-md-6" style="margin-top: 25px;">
749 758 <div class="pull-left" style="width: 110px;">
750 759 <label class="new-input-label"><b>Volume</b></label>
751 760 </div>
... ... @@ -754,7 +763,36 @@
754 763 </div>
755 764 <div class="clearfix"></div>
756 765 </div>
757   -
  766 + </div>
  767 + <div class="clearfix"></div><br>
  768 +
  769 + <div class="col-xs-12">
  770 +
  771 + <div class="col-md-6">
  772 + <div class="pull-left" style="width: 110px;">
  773 + <label class="new-input-label"><b>ETD</b></label>
  774 + </div>
  775 + <div class="pull-left" style="width: calc(100% - 110px);">
  776 + <div style="width: 50%; float: left;">
  777 + <input type="text" style="width: 90%" ng-model="editdata.departingDateString" class="form-control" placeholder="" datepicker/>
  778 + </div>
  779 + <div style="width: 50%; float: left;">
  780 + <select ui-select2 ng-model="etdTimeList" style="width: 90%;">
  781 + <option ng-repeat="list in etdTimeList">{{list.time}}</option>
  782 + </select>
  783 + </div>
  784 + </div>
  785 + <div class="clearfix"></div>
  786 + </div>
  787 + <div class="col-md-6">
  788 + <div class="pull-left" style="width: 110px;">
  789 + <label class="new-input-label"><b>Fuel on</b></label>
  790 + </div>
  791 + <div class="pull-left" style="width: calc(100% - 110px);">Arrival
  792 + <!-- <input type="text" ng-model="editdata.requestedVolume" ng-keyup="updateTotal(editdata.requestedVolume,'v')" class="form-control" placeholder=""> -->
  793 + </div>
  794 + <div class="clearfix"></div>
  795 + </div>
758 796 </div>
759 797 <div class="clearfix"></div><br>
760 798  
... ... @@ -769,7 +807,7 @@
769 807 <option value="" selected disabled>Select Company</option>
770 808 <option ng-repeat="list in companyList">{{list.companyName}}</option>
771 809 </select>-->
772   - {{editdata.companyName}}
  810 + {{editdata.companyName}}
773 811 </div>
774 812 <div class="clearfix"></div>
775 813 </div>
... ... @@ -805,8 +843,8 @@
805 843 <label class="new-input-label"><b>Total</b></label>
806 844 </div>
807 845 <div class="pull-left" style="width: calc(100% - 110px);">
808   - <input type="text" class="form-control" disabled ng-model="editdata.total" placeholder="0.0" ng-value="{{editdata.requestedVolume * editdata.invoiced}}">
809   - <!--{{editdata.total }}-->
  846 + <input type="text" class="form-control" disabled ng-model="editdata.total | number : 4" placeholder="" ng-value="{{editdata.requestedVolume * editdata.invoiced}}">
  847 + <!--{{editdata.total }}-->
810 848 </div>
811 849 <div class="clearfix"></div>
812 850 </div>
... ... @@ -834,19 +872,19 @@
834 872 </div>
835 873 <div class="col-md-6">
836 874 <div class="pull-left" style="width: 110px;">
837   - <label class="new-input-label"><b>FBO Cost</b></label>
  875 + <label class="new-input-label"><b>Product</b></label>
838 876 </div>
839 877 <div class="pull-left" style="width: calc(100% - 110px);">
840 878 <!--<input type="text" ng-model="editdata.fboCost" class="form-control" placeholder="">-->
841   - {{editdata.fboCost}}
  879 + {{editdata.productName}}
842 880 </div>
843 881 <div class="clearfix"></div>
844 882 </div>
845 883 </div>
846 884 <div class="clearfix"></div>
847 885 <br/>
848   - <div class="col-xs-12">
849 886  
  887 + <div class="col-xs-12">
850 888  
851 889 <div class="col-md-6">
852 890 <div class="pull-left" style="width: 110px;">
... ... @@ -865,12 +903,25 @@
865 903 </div>
866 904 <div class="clearfix"></div>
867 905 </div>
  906 + <div class="col-md-6">
  907 + <div class="pull-left" style="width: 110px;">
  908 + <label class="new-input-label"><b>Certificate Type</b></label>
  909 + </div>
  910 + <div class="pull-left" style="width: calc(100% - 110px);">
  911 + <select class="form-control" ng-model="editdata.certificateType" style="width: 100%;" required>
  912 + <option value="" disabled selected hidden>Select...</option>
  913 + <option value="corporate">Part 91 (Corporate)</option>
  914 + <option value="charter">Part 135 (Charter)</option>
  915 + <option value="scheduled">Part 121 (Scheduled)</option>
  916 + <option value="military">Military</option>
  917 + <option value="government">Government</option>
  918 + </select>
  919 + </div>
  920 +
868 921 </div>
869 922 <div class="clearfix"></div>
870 923 <br/>
871 924 <div class="col-xs-12">
872   -
873   -
874 925 </div>
875 926 <div class="clearfix"></div>
876 927 <br/>
... ... @@ -978,3 +1029,15 @@ sendEvent = function(sel, step) {
978 1029 $(sel).trigger('next.m.' + step);
979 1030 }
980 1031 </script>
  1032 +
  1033 +<script>
  1034 + angular.module("KendoDemos", [ "kendo.directives" ])
  1035 + .controller("MyCtrl", function($scope){
  1036 + $scope.getType = function(x) {
  1037 + return typeof x;
  1038 + };
  1039 + $scope.isDate = function(x) {
  1040 + return x instanceof Date;
  1041 + };
  1042 + })
  1043 +</script>
981 1044 \ No newline at end of file
... ...