viithiisys / Acufuel

Download as
Browse Code ยป

Commit 7f6e3b1df9414393ab94488199965e8bf37dedd0

Authored by Kuldeep Arora
1 parent 4f1de64cdb
Exists in master

final code

Showing 21 changed files with 30 additions and 431 deletions   Show diff stats
app/partials/FuelVendors/FuelVendors.controller.js
Diff comments   View file @7f6e3b1
... ... @@ -7,11 +7,7 @@
7 7  
8 8 function FuelVendorsController($scope, $rootScope, $uibModal, $filter, $http, FuelVendorsService, CustomersService, ViewFuelVendorService, NgTableParams) {
9 9  
10   - /*$(document).ready(function() {
11   - $scope.showLoader = true;
12   - $('#example').DataTable();
13   - $scope.showLoader = false;
14   - });*/
  10 +
15 11 $scope.userProfileId = JSON.parse(localStorage.getItem('userProfileId'))
16 12 $scope.reset = function(){
17 13 $("input").val("");
... ... @@ -82,9 +78,7 @@
82 78 })
83 79 }
84 80  
85   - // CustomersService.getMargin().then(function(result) {
86   - // $scope.marginList = result;
87   - // })
  81 +
88 82  
89 83 CustomersService.getJetMargin($scope.userProfileId).then(function(result) {
90 84 $scope.jetMarginList = result;
... ... @@ -120,9 +114,7 @@
120 114 })
121 115 }
122 116 })
123   - /*$scope.data.addressOne
124   - $scope.data.addressTwo
125   - $scope.data.city*/
  117 +
126 118  
127 119 $scope.addFirstData = function(sel, step){
128 120 // console.log($scope.data)
... ...
app/partials/accountSetting/accountSetting.Controller.js
Diff comments   View file @7f6e3b1
... ... @@ -83,7 +83,7 @@
83 83  
84 84 var updateData = "companyName=" + $scope.userData.companyName + "&username=" + $scope.userData.username + "&firstName=" + $scope.userData.firstName
85 85 + "&lastName=" + $scope.userData.lastName + "&phone=" + $scope.userData.phone + "&mobile=" + $scope.userData.mobile
86   - + "&status=" + $scope.userData.status + "&userType=" + $scope.userData.userType + "&userTypeId=" + $scope.userData.userType.id + "&userProfileId=" + $scope.userid + "&userTimeZone=" + $scope.userData.userTimeZone;
  86 + + "&status=" + $scope.userData.status + "&userType=" + $scope.userData.userType + "&userTypeId=" + $scope.userData.userType.id + "&userProfileId=" + $scope.userid + "&userTimeZone=" + $scope.userData.userTimeZone + "&icao=" + $scope.userData.icao;
87 87  
88 88 // console.log("======updateData===",updateData)
89 89 AccountSettingService.updateUserProfile(updateData).then(function(result) {
... ...
app/partials/accountSetting/accountSetting.Service.js
Diff comments   View file @7f6e3b1
... ... @@ -19,7 +19,6 @@
19 19 }).then(function(result) {
20 20 deferred.resolve(result.data);
21 21 }, function(result) {
22   - //console.log(result.data)
23 22 deferred.resolve(result.data);
24 23 })
25 24 return deferred.promise;
... ... @@ -56,7 +55,6 @@
56 55 }).then(function(result) {
57 56 deferred.resolve(result.data);
58 57 }, function(result) {
59   - //console.log(result.data)
60 58 deferred.resolve(result.data);
61 59 })
62 60 return deferred.promise;
... ... @@ -74,7 +72,6 @@
74 72 }).then(function(result) {
75 73 deferred.resolve(result.data);
76 74 }, function(result) {
77   - //console.log(result.data)
78 75 deferred.resolve(result.data);
79 76 })
80 77 return deferred.promise;
... ... @@ -93,14 +90,12 @@
93 90 }).then(function(result) {
94 91 deferred.resolve(result.data);
95 92 }, function(result) {
96   - //console.log(result.data)
97 93 deferred.resolve(result.data);
98 94 })
99 95 return deferred.promise;
100 96 }
101 97  
102 98 this.addAdditionalAccount = function(data) {
103   - console.log('----$scope.accountdata--', data);
104 99 var deferred = $q.defer();
105 100 $http({
106 101 method : 'POST',
... ... @@ -128,7 +123,6 @@
128 123 .then(function (result){
129 124 deferred.resolve(result.data);
130 125 },function (result){
131   - //console.log(result.data)
132 126 deferred.resolve(result.data);
133 127 })
134 128 return deferred.promise;
... ... @@ -147,7 +141,6 @@
147 141 }).then(function(result) {
148 142 deferred.resolve(result.data);
149 143 }, function(result) {
150   - //console.log(result.data)
151 144 deferred.resolve(result.data);
152 145 })
153 146 return deferred.promise;
... ... @@ -165,7 +158,6 @@
165 158 }).then(function(result) {
166 159 deferred.resolve(result.data);
167 160 }, function(result) {
168   - //console.log(result.data)
169 161 deferred.resolve(result.data);
170 162 })
171 163 return deferred.promise;
... ...
app/partials/accountSetting/accountSetting.html
Diff comments   View file @7f6e3b1
... ... @@ -23,26 +23,27 @@
23 23 <div class="form-group"><label>Mobile</label> <input type="tel" ng-model="userData.mobile" placeholder="Mobile" class="form-control"></div>
24 24 <div class="form-group"><label>Company Name</label> <input type="tel" ng-model="userData.companyName" placeholder="Company Name" class="form-control"></div>
25 25 </div>
26   - <div class="col-xs-12">
27   - <div class="col-xs-12">
28   - <div class="form-group">
29   - <div class="row">
30   - <div class="col-md-6">
  26 + <div class="col-sm-6">
31 27 <label class="new-input-label"><b>FBO Time Zone&nbsp;</b></label>
32   -
33   - <!-- <ds-widget-clock gmt-offset="gmtValue" data-show-digital digital-format="'HH:mm:ss'" show-gmt-info style="width: 200px"></ds-widget-clock> -->
34   - <select class="form-control" ng-model="userData.userTimeZone" style="width:180px">
  28 + <select class="form-control" ng-model="userData.userTimeZone" >
35 29 <option value="" selected disabled>Select Timezone</option>
36 30 <option ng-repeat="tz in timeZoneList" value="{{tz.value}}">{{tz.name}}
37 31 </option>
38 32 </select>
39 33 </div>
40 34 <div class="col-sm-6">
  35 + <div class="form-group"><label>ICAO</label> <input type="text" ng-model="userData.icao" placeholder="ICAO" class="form-control"></div>
  36 +
  37 + </div>
  38 +
  39 + <div class="col-xs-12">
  40 + <div class="col-xs-12">
  41 + <div class="form-group">
  42 + <div class="row">
  43 +
  44 + <div class="col-sm-6">
41 45 <label class="new-input-label"><b>Fuel Types Offered&nbsp;</b></label>
42   - <!-- </div>
43   - <div class="col-md-6" > -->
44 46 <label ng-repeat="product in productList" style="width: 100%; font-weight: normal;">
45   - <!-- <input type="checkbox" ng-model="product.status" ng-click="checkProduct(product)"> {{product.name}}<br> -->
46 47 <input type="checkbox" id="Weekdays" ng-model="product.status" ng-click="checkProduct(productList, product, $index)">{{product.name}}
47 48 </label>
48 49  
... ...
app/partials/analytics/analytics.controller.js
Diff comments   View file @7f6e3b1
... ... @@ -14,8 +14,6 @@ angular.module(&#39;acufuel&#39;)
14 14 $scope.flag = true; //for spinner
15 15 var data = Highcharts.geojson(Highcharts.maps['countries/us/us-all']);
16 16 var separators = Highcharts.geojson(Highcharts.maps['countries/us/us-all'], 'mapline');
17   - // Some responsiveness
18   - //var small = $('#container').width() < 400;
19 17  
20 18 analyticsService.getAllRPP().then(function(result) {
21 19 for (var i = 0; i < data.length; i++) {
... ... @@ -123,18 +121,6 @@ angular.module(&#39;acufuel&#39;)
123 121 }
124 122 },
125 123  
126   - /* legend: small ? {} : {
127   - layout: 'vertical',
128   - align: 'right',
129   - verticalAlign: 'middle'
130   - },
131   -
132   - colorAxis: {
133   - min: 0,
134   - minColor: '#E6E7E8',
135   - maxColor: '#005645'
136   - },*/
137   -
138 124 mapNavigation: {
139 125 enabled: true,
140 126 buttonOptions: {
... ... @@ -235,7 +221,7 @@ angular.module(&#39;acufuel&#39;)
235 221 axisLabel: 'Orders',
236 222 axisLabelDistance: -20,
237 223 tickFormat: function(d) {
238   - return d3.format(',.1f')(d);
  224 + return d3.format(',')(d);
239 225 }
240 226 }
241 227 }
... ... @@ -251,11 +237,11 @@ angular.module(&#39;acufuel&#39;)
251 237 //var makeId = makeId;
252 238 analyticsService.getCS().then(function(result) {
253 239 $scope.csValues = result;
  240 + console.log("cs",result)
254 241 $scope.optionscs = {
255 242 chart: {
256 243 type: 'pieChart',
257 244 height: 500,
258   - // color: ["#FEDFC3","#D89700","#FFE8B3","FFD980","#FF7F0E","#fff2e6","#ffcc99","#ffa64d","#ff8c1a","#B37D00","#f5f5f0","#e0e0d1","#ccccb3","#adad85","#999966","#7a7a52"],
259 245 x: function(d) {
260 246 return d.key;
261 247 },
... ... @@ -627,7 +613,6 @@ angular.module(&#39;acufuel&#39;)
627 613 chart: {
628 614 type: 'pieChart',
629 615 height: 500,
630   - // color: ["#FEDFC3","#D89700","#FFE8B3","FFD980","#FF7F0E","#fff2e6","#ffcc99","#ffa64d","#ff8c1a","#B37D00","#f5f5f0","#e0e0d1","#ccccb3","#adad85","#999966","#7a7a52"],
631 616 x: function(d) {
632 617 return d.key;
633 618 },
... ...
app/partials/analytics/analytics.html
Diff comments   View file @7f6e3b1
... ... @@ -137,17 +137,7 @@
137 137 <!-- /span6 -->
138 138 <div class="col-md-6">
139 139 <div class="customInputWrap">
140   - <div style="margin-top: 75px">
141   - <!-- <label>Date Range Filter</label>
142   - <form name="myForm3">
143   - <input type="text" ng-model="rpp.fromDate" datepicker class="form-control" placeholder="From Date" required ng-required="true" style="width: 120px; float: left; margin-right: 15px;"/>
144   - <input type="text" ng-model="rpp.toDate" datepicker class="form-control" placeholder="To Date" style="width: 120px; float: left; margin-right: 15px;">
145   - <button class="btn btn-primary" ng-disabled="myForm3.$invalid" ng-click="submitDateRpp()" style="float: left; display: none;">Apply</button>
146   - <button class="btn btn-primary" ng-click="submitDateRpp()" style="float: left;">Apply</button>
147   - <div class="clearfix"></div>
148   - </form> -->
149   - </div>
150   - <div class="clearfix"></div>
  140 + <div class="clearfix"></div>
151 141 </div>
152 142 <div class="widget stacked">
153 143 <div class="widget-header">
... ... @@ -159,9 +149,6 @@
159 149 <div ng-show="flag">
160 150 <center><img id="spinner" src="/img/spinner.gif"/></center>
161 151 </div>
162   - <!-- <div id="map" style="width: 100%; height: 325px;"></div> -->
163   -
164   - <!-- <div ng-hide="flag" id="regional-pap" style="height: 400px; min-width: 310px; max-width: 600px; margin: 0 auto"></div> -->
165 152  
166 153 <div ng-hide="flag" id="container" style="height: 400px; min-width: 310px; max-width: 600px; margin: 0 auto"></div>
167 154 </div>
... ...
app/partials/analytics/analytics.service.js
Diff comments   View file @7f6e3b1
... ... @@ -71,21 +71,6 @@
71 71 return deferred.promise;
72 72 }
73 73  
74   - // this.getRPP = function(code){
75   - // var deferred = $q.defer();
76   - // $http({
77   - // method : 'GET',
78   - // url : BASE_URL.url +'/fuelerlinx/getCompleteRegionalPap/'+code
79   - // })
80   - // .then(function (result){
81   - // deferred.resolve(result.data);
82   - // },function (result){
83   - // console.log(result)
84   - // deferred.resolve(result.data);
85   - // })
86   - // return deferred.promise;
87   - // }
88   -
89 74  
90 75 /* without region code */
91 76 this.getAllRPP = function(){
... ...
app/partials/customers/customers.controller.js
Diff comments   View file @7f6e3b1
... ... @@ -51,15 +51,6 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta
51 51  
52 52 );
53 53  
54   - /*function getAllCompanies(){
55   - CustomersService.getAllCompanies().then(function(result) {
56   - $scope.companyList = result;
57   - for(var i=0; i<$scope.companyList.length; i++){
58   - $scope.companyList[i].masterMargin = $scope.companyList[i].margin.id;
59   - }
60   - })
61   -
62   - }*/
63 54  
64 55 $scope.statusFilter = [
65 56 {
... ... @@ -156,9 +147,7 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta
156 147 $scope.showLoader = false;
157 148 })
158 149 }
159   - // CustomersService.getMargin().then(function(result) {
160   - // $scope.marginList = result;
161   - // })
  150 +
162 151 $scope.marginFilterOptions = [];
163 152 CustomersService.getJetMargin($scope.userProfileId).then(function(result) {
164 153 $scope.showLoader = true;
... ... @@ -271,13 +260,7 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta
271 260 }
272 261  
273 262  
274   - /*$scope.getModal = function(makeId, index) {
275   - $scope.showLoader = true;
276   - CustomersService.getModal($scope.aircraft.make).then(function(result) {
277   - $scope.showLoader = false;
278   - $scope.aircraftDetails[index].aircraftModalList = result;
279   - })
280   - }*/
  263 +
281 264 $scope.getModal = function(makeId, index) {
282 265 $scope.showLoader = true;
283 266 $scope.aircraft.make = makeId;
... ... @@ -300,13 +283,6 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta
300 283 })
301 284 }
302 285  
303   - /*$scope.getSize = function(model, index) {
304   - $scope.showLoader = true;
305   - CustomersService.getAircraftSize($scope.aircraft.make, model).then(function(result) {
306   - $scope.showLoader = false;
307   - $scope.aircraftDetails[index].aircraftSizeList = result;
308   - })
309   - }*/
310 286  
311 287 $scope.getFuelType = function(size, index) {
312 288 $scope.showLoader = true;
... ... @@ -614,19 +590,6 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta
614 590 })
615 591 }
616 592  
617   - // old api not use
618   - /*$scope.checkJetWithTail = function(tail, index) {
619   - ViewCompanyService.checkJetType(tail).then(function(result) {
620   - if (result.jetA == "true") {
621   - $scope.jetShow[index] = false;
622   - $scope.marginShow[index] = true;
623   - } else {
624   - $scope.jetShow[index] = true;
625   - $scope.marginShow[index] = false;
626   - }
627   - })
628   - }*/
629   -
630 593  
631 594 $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"},
632 595 {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"},
... ...
app/partials/customers/customers.html
Diff comments   View file @7f6e3b1
... ... @@ -368,73 +368,10 @@
368 368 </div>
369 369 <div class="widget-content" style="padding:0px;border: 0px; ">
370 370 <div class="table-responsive">
371   -
372   - <!-- <table class="table table-striped table-bordered">
373   - <thead>
374   - <tr>
375   - <th>Tail</th>
376   - <th>Make</th>
377   - <th>Model</th>
378   - <th>Size</th>
379   - <th>JET A Margin</th>
380   - <th>AVGS 100LL Margin</th>
381   - </tr>
382   - </thead>
383   - <tbody>
384   - <tr ng-repeat="aircraftData in aircraftDetails track by $index">
385   - <td style="width: 15%">
386   - <input type="text" class="form-control" ng-model="aircraftData.tail" ng-blur="checkJetWithTail(aircraftData.tail, $index)" required/>
387   - </td>
388   - <td style="width: 17%">
389   - <select class="form-control" ng-model="aircraftData.make" ng-change="getModal(aircraftData.make, $index)">
390   - <option ng-repeat="make in aircraftMakeList | orderBy ">{{make}}</option>
391   - <option value="" disabled>Select...</option>
392   - </select>
393   - </td>
394   - <td style="width: 17%">
395   - <select class="form-control" ng-model="aircraftData.model" ng-change="getSize(aircraftData.model, $index)">
396   - <option ng-repeat="model in aircraftData.aircraftModalList | orderBy">{{model}}</option>
397   - <option value="" disabled>Select...</option>
398   - </select>
399   - </td>
400   - <td style="width: 17%">
401   - <select class="form-control" ng-model="aircraftData.sizeId">
402   - <option value="" disabled>Select</option>
403   - <option ng-repeat="size in aircraftData.aircraftSizeList" value="{{size.aircraftSize.id}}">{{size.aircraftSize.size}}</option>
404   - </select>
405   -
406   - </td>
407   - <td style="width: 17%">
408   - <select class="form-control" ng-model="aircraftData.marginId" ng-disabled="jetShow[$index]">
409   - <option value="" disabled>Select</option>
410   - <option ng-repeat="margin in jetMarginList" value="{{margin.id}}">{{margin.marginName}}</option>
411   - </select>
412   -
413   -
414   - </td>
415   - <td style="width: 17%">
416   - <select class="form-control" ng-model="aircraftData.avgasMarginId" ng-disabled="marginShow[$index]">
417   - <option value="" disabled>Select</option>
418   - <option ng-repeat="avgs in avgsMarginList" value="{{avgs.id}}">{{avgs.marginName}}</option>
419   - </select>
420   -
421   - </td>
422   - </tr>
423   - </tbody>
424   - </table>
425   - </div>
426   - <div class="clearfix"></div>
427   - </div>
428   - </div>
429   - <div class="clearfix"></div>
430   - <div class="col-xs-12" style="margin-bottom: 50px;margin-top: 10px;">
431   - <button ng-click="addNew()" class="button1 turquoise pull-right"><span>+</span>Add Aircraft</button>
432   - </div> -->
433 371  
434 372 <table class="table table-striped table-bordered">
435 373 <thead>
436 374 <tr>
437   - <!-- <th><input type="checkbox" ng-model="selectedAll" ng-click="checkAll()" /></th> -->
438 375 <th>Tail</th>
439 376 <th>Make</th>
440 377 <th>Model</th>
... ... @@ -445,12 +382,7 @@
445 382 </thead>
446 383 <tbody>
447 384 <tr ng-repeat="aircraftData in aircraftDetails track by $index">
448   - <!-- <td>
449   - <input type="checkbox" ng-model="aircraftData.selected"/>
450   - </td> -->
451   - <!-- <td style="width: 15%">
452   - <input type="tel" class="form-control" ng-model="aircraftData.tail" ng-blur="checkJetWithTail(aircraftData.tail, $index)" required/>
453   - </td> -->
  385 +
454 386 <td style="width: 15%">
455 387 <input type="tel" class="form-control" ng-model="aircraftData.tail" ng-blur="checkTail(aircraftData.tail, $index);" required/>
456 388 </td>
... ... @@ -472,8 +404,6 @@
472 404 <option ng-repeat="size in aircraftData.aircraftSizeList" value="{{size.aircraftSize.id}}" ng-selected="aircraftData.size = aircraftData.aircraftSizeList[0].aircraftSize.id">{{size.aircraftSize.size}}</option>
473 405 </select>
474 406  
475   - <!-- <select class="form-control" ng-model="aircraftData.sizeId" ng-options="size.aircraftSize.id as size.aircraftSize.size for size in aircraftData.aircraftSizeList"></select> -->
476   -
477 407 </td>
478 408 <td style="width: 17%">
479 409  
... ... @@ -482,21 +412,12 @@
482 412 <option ng-repeat="margin in jetMarginList" value="{{margin.id}}">{{margin.marginName}}</option>
483 413 </select>
484 414  
485   - <!-- <select class="form-control" ng-model="aircraftData.marginId" ng-options="margin.id as margin.marginName for margin in jetMarginList" ng-disabled="jetShow[$index]">
486   -
487   - <option value="" disabled>Select...</option>
488   - </select> -->
489   -
490 415 </td>
491 416 <td style="width: 17%">
492 417 <select class="form-control" ng-model="aircraftData.avgasMarginId" ng-disabled="marginShow[$index]">
493 418 <option value="" disabled>Select</option>
494 419 <option ng-repeat="avgs in avgsMarginList" value="{{avgs.id}}">{{avgs.marginName}}</option>
495 420 </select>
496   -
497   - <!-- <select class="form-control marginSelectBox" ng-model="aircraftData.avgasMarginId" ng-options="avgs.id as avgs.marginName for avgs in avgsMarginList" ng-disabled="marginShow[$index]">
498   - <option value="" disabled>Select...</option>
499   - </select> -->
500 421 </td>
501 422 </tr>
502 423 </tbody>
... ... @@ -786,12 +707,7 @@
786 707 <div style="font-weight: normal;" ng-if="baseTenant && !contractFuelVendor">Tenant/Base Customer</br></div>
787 708 <div style="font-weight: normal;" ng-if="contractFuelVendor && !baseTenant">CAA Member</div>
788 709 <div style="font-weight: normal;" ng-if="contractFuelVendor && baseTenant">Tenant/CAA</div>
789   - <!-- <select class="form-control" ng-model="order.source" style="width: 100%;">
790   - <option value="" disabled selected hidden>Select Source</option>
791   - <option value="Tenant">Tenant</option>
792   - <option value="CAA">CAA</option>
793   - <option value="Tenant/CAA">Tenant/CAA</option>
794   - </select> -->
  710 +
795 711 </div>
796 712 <div class="clearfix"></div>
797 713 </div>
... ...
app/partials/dashboard/dashboard.controller.js
Diff comments   View file @7f6e3b1
... ... @@ -171,26 +171,6 @@
171 171 }
172 172  
173 173  
174   -
175   -// $scope.submitLogin = function() {
176   -// LoginService.setAuth(true);
177   -// toastr.info("Login successfully");
178   -// $state.go('app.dashboard');
179   -// /*LoginService.login($scope.username, $scope.password).then(function(result){
180   -// if(typeof result == 'object') {
181   -// LoginService.setAuth(true);
182   -// $rootScope.path = true;
183   -// var reqPwdChng = localStorage.getItem("requiredChangePwd");
184   -// if (reqPwdChng && reqPwdChng == "Y") {
185   -// $state.go('resetPassword');
186   -// } else {
187   -// $state.go('app.upload');
188   -// }
189   -// } else {
190   -// toastr.info("Error in login. Please check login name and password");
191   -// }
192   -// })*/
193   -// }
194 174  
195 175 $scope.completeOrderCount = '';
196 176 $scope.pendingOrderCount= '';
... ... @@ -269,7 +249,6 @@
269 249 //staggerLabels: true,
270 250 duration: 500,
271 251 stacked: false,
272   - //color: ["#FEDFC3", "#990000", "#000099", "#009900"],
273 252 color: ["#A9A9A9", "#000099", "#990000", "#009900"],
274 253 xAxis: {
275 254 axisLabel: 'Months',
... ... @@ -279,7 +258,7 @@
279 258 axisLabel: 'Orders',
280 259 axisLabelDistance: -20,
281 260 tickFormat: function(d) {
282   - return d3.format(',.1f')(d);
  261 + return d3.format(',')(d);
283 262 }
284 263 }
285 264 }
... ...
app/partials/dashboard/dashboard.html
Diff comments   View file @7f6e3b1
... ... @@ -4,19 +4,7 @@
4 4 }
5 5  
6 6 </style>
7   -<!-- <style>
8   -table, th , td {
9   - border: 1px solid grey;
10   - border-collapse: collapse;
11   - padding: 5px;
12   -}
13   -table tr:nth-child(odd) {
14   - background-color: #f1f1f1;
15   -}
16   -table tr:nth-child(even) {
17   - background-color: #ffffff;
18   -}
19   -</style> -->
  7 +
20 8 <div class="main">
21 9 <div class="container" ng-if="isAuthenticated">
22 10 <div class="row">
... ... @@ -34,9 +22,6 @@ table tr:nth-child(even) {
34 22 <div class="col-xs-12">
35 23 <label class="pull-left" style="font-size: 13px" >Completed</label>
36 24 <span style="font-size: 11px">&nbsp;Monthly</span>
37   - <!-- <button class="btn btn-success btn-xs pull-right" style="cursor: default"> -->
38   - <!-- <label class="pull-right">Montly</label> -->
39   - <!-- <span style="font-size:13px;">(Monthly)</span> -->
40 25 <div class="clearfix"></div>
41 26 </div>
42 27 <div class="clearfix"></div>
... ... @@ -59,7 +44,6 @@ table tr:nth-child(even) {
59 44 <div class="col-xs-12">
60 45 <label class="pull-left" style="font-size: 13px" >Pending</label>
61 46 <span style="font-size: 11px">&nbsp;Monthly</span>
62   - <!-- <span class="pull-left">Pending</span><button class="btn btn-success btn-xs pull-right pull-right-color " style="cursor: default"><span style="font-size:9px;">Monthly</span></button> -->
63 47 <div class="clearfix"></div>
64 48 </div>
65 49 <div class="clearfix"></div>
... ... @@ -82,7 +66,6 @@ table tr:nth-child(even) {
82 66 <div class="col-xs-12">
83 67 <label class="pull-left" style="font-size: 12px" >Activity :&nbsp;Airport Operations</label>
84 68 <span style="font-size: 11px">&nbsp;&nbsp;Monthly</span>
85   - <!-- <span class="pull-left">Activity: Airport Operations</span><button class="btn btn-primary btn-xs pull-right" style="cursor: default"><span style="font-size:9px;">Monthly</span></button> -->
86 69 <div class="clearfix"></div>
87 70 </div>
88 71 <div class="clearfix"></div>
... ...
app/partials/enterFuelOrder/enterFuelOrder.html
Diff comments   View file @7f6e3b1
... ... @@ -227,12 +227,6 @@
227 227 <div style="font-weight: normal;" ng-if="baseTenant && !contractFuelVendor">Tenant/Base Customer</br></div>
228 228 <div style="font-weight: normal;" ng-if="contractFuelVendor && !baseTenant">CAA Member</div>
229 229 <div style="font-weight: normal;" ng-if="contractFuelVendor && baseTenant">Tenant/CAA</div>
230   - <!-- <select class="form-control" ng-model="order.source" style="width: 100%;">
231   - <option value="" disabled selected hidden>Select Source</option>
232   - <option value="Tenant">Tenant</option>
233   - <option value="CAA">CAA</option>
234   - <option value="Tenant/CAA">Tenant/CAA</option>
235   - </select> -->
236 230 </div>
237 231 <div class="clearfix"></div>
238 232 </div>
... ...
app/partials/fuelManager/fuelManager.controller.js
Diff comments   View file @7f6e3b1
... ... @@ -13,13 +13,11 @@
13 13 var mmn = todayDate.getMonth()+1; //January is 0!
14 14 var yyyyn = todayDate.getFullYear();
15 15  
16   - if(ddn
17   -<10) {
  16 + if(ddn < 10 ) {
18 17 ddn ='0'+ddn
19 18 }
20 19  
21   - if(mmn
22   - <10) {
  20 + if(mmn < 10) {
23 21 mmn ='0'+mmn
24 22 }
25 23  
... ...
app/partials/fuelOrders/fuelOrders.controller.js
Diff comments   View file @7f6e3b1
... ... @@ -87,11 +87,6 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
87 87 myselect.style.background = colour;
88 88 myselect.blur();
89 89 }
90   -
91   -
92   - /*setInterval(function(){
93   - colourFunction();
94   - }, 1)*/
95 90  
96 91  
97 92 $scope.attachmentFilterOptions = [];
... ... @@ -104,11 +99,6 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
104 99 }
105 100 );
106 101  
107   - // $(document).ready(function() {
108   - // $scope.showLoader = true;
109   - // $('#example').DataTable();
110   - // $scope.showLoader = false;
111   - // });
112 102  
113 103 $scope.getOrders = function() {
114 104 fuelOrdersService.getOrders().then(function(result) {
... ...
app/partials/fuelOrders/fuelOrders.html
Diff comments   View file @7f6e3b1
... ... @@ -384,50 +384,9 @@
384 384 </div>
385 385 <div class="widget-content" style="padding:0px;border: 0px; ">
386 386 <div class="table-responsive">
387   - <!-- <table class="table table-bordered table-hover table-striped addRow" style="margin-bottom: 0px;">
388   - <thead>
389   - <tr>
390   - <th>Tail</th>
391   - <th>Make</th>
392   - <th>Model</th>
393   - <th>Size</th>
394   - <th>Margin</th>
395   - </tr>
396   - </thead>
397   - <tbody>
398   - <tr>
399   - <td>
400   - <input type="text" style="width:100px;" ng-model="aircraft.tail" class="form-control">
401   - </td>
402   - <td style="width: 25%;">
403   - <select class="form-control" ng-model="aircraft.make" ng-change="getModal()">
404   - <option ng-repeat="make in aircraftMakeList">{{make}}</option>
405   - </select>
406   - </td>
407   - <td style="width: 20%;">
408   - <select class="form-control" ng-model="aircraft.model" ng-change="getSize()">
409   - <option ng-repeat="model in aircraftModalList">{{model}}</option>
410   - </select>
411   - </td>
412   - <td style="width: 25%;">
413   - <select class="form-control" ng-model="aircraft.size">
414   - <option ng-repeat="size in aircraftSizeList">{{size}}</option>
415   - </select>
416   - </td>
417   - <td>
418   - <select class="form-control">
419   - <option>Margin1</option>
420   - <option>Margin2</option>
421   - </select>
422   - </td>
423   - </tr>
424   - </tbody>
425   -
426   - </table> -->
427 387 <table class="table table-striped table-bordered">
428 388 <thead>
429 389 <tr>
430   - <!-- <th><input type="checkbox" ng-model="selectedAll" ng-click="checkAll()" /></th> -->
431 390 <th>Tail</th>
432 391 <th>Make</th>
433 392 <th>Model</th>
... ... @@ -438,9 +397,6 @@
438 397 </thead>
439 398 <tbody>
440 399 <tr ng-repeat="aircraftData in aircraftDetails track by $index">
441   - <!-- <td>
442   - <input type="checkbox" ng-model="aircraftData.selected"/>
443   - </td> -->
444 400 <td style="width: 15%">
445 401 <input type="text" class="form-control" ng-model="aircraftData.tail" ng-blur="checkJetWithTail(aircraftData.tail, $index)" required/>
446 402 </td>
... ... @@ -457,30 +413,18 @@
457 413 </select>
458 414 </td>
459 415 <td style="width: 17%">
460   - <!-- <select class="form-control" ng-model="aircraftData.sizeId" ng-options="size.aircraftSize.id as size.aircraftSize.size for size in aircraftData.aircraftSizeList">
461   - <option value="" disabled>Select...</option>
462   - </select> -->
463 416 <select class="form-control" ng-model="aircraftData.sizeId">
464 417 <option value="" disabled>Select</option>
465 418 <option ng-repeat="size in aircraftData.aircraftSizeList" value="{{size.aircraftSize.id}}">{{size.aircraftSize.size}}</option>
466 419 </select>
467   - <!-- <select class="form-control" ng-model="aircraftData.size">
468   - <option ng-repeat="size in aircraftData.aircraftSizeList">{{size}}</option>
469   - </select> -->
470 420 </td>
471 421 <td style="width: 17%">
472   - <!-- <select class="form-control" ng-model="aircraftData.marginId" ng-options="margin.id as margin.marginName for margin in jetMarginList">
473   - <option value="" disabled>Select...</option>
474   - </select> -->
475 422 <select class="form-control" ng-model="aircraftData.marginId" ng-disabled="jetShow[$index]">
476 423 <option value="" disabled>Select</option>
477 424 <option ng-repeat="margin in jetMarginList" value="{{margin.id}}">{{margin.marginName}}</option>
478 425 </select>
479 426 </td>
480 427 <td style="width: 17%">
481   - <!-- <select class="form-control marginSelectBox" ng-model="aircraftData.avgasMarginId" ng-options="avgs.id as avgs.marginName for avgs in avgsMarginList">
482   - <option value="" disabled>Select...</option>
483   - </select> -->
484 428 <select class="form-control" ng-model="aircraftData.avgasMarginId" ng-disabled="marginShow[$index]">
485 429 <option value="" disabled>Select</option>
486 430 <option ng-repeat="avgs in avgsMarginList" value="{{avgs.id}}">{{avgs.marginName}}</option>
... ... @@ -497,13 +441,6 @@
497 441 <div class="col-xs-12" style="margin-bottom: 50px;margin-top: 10px;">
498 442 <button ng-click="addNew()" class="button1 turquoise pull-right"><span>+</span>Add Aircraft</button>
499 443 </div>
500   - <!-- <div class="col-xs-12" style="margin-bottom: 20px;">
501   - <div class="pull-right">
502   - <button type="button" class="btn btn-default" ng-click="cancelCraft()">Cancel</button>
503   - <button type="button" class="btn btn-warning" ng-click="goBack()">Go Back</button>
504   - <button type="button" class="btn btn-success" ng-click="goBack()">Save</button>
505   - </div>
506   - </div> -->
507 444 </div>
508 445 </div>
509 446 <div class="clearfix"></div>
... ... @@ -511,9 +448,6 @@
511 448 </div>
512 449 </div>
513 450 </div>
514   - <!-- <div class="modal-body step-3" data-step="3">
515   - This is the final step.
516   - </div> -->
517 451 <div class="modal-footer" style="border-top: 0;">
518 452 <button type="button" class="btn btn-default" ng-click="reset2()" data-dismiss="modal">Cancel</button>
519 453 <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="addFirstData('#demo-modal-3', 2)">Next: Add Aircraft</button>
... ... @@ -745,12 +679,6 @@
745 679 <div style="font-weight: normal;" ng-if="baseTenant && !contractFuelVendor">Tenant/Base Customer</br></div>
746 680 <div style="font-weight: normal;" ng-if="contractFuelVendor && !baseTenant">CAA Member</div>
747 681 <div style="font-weight: normal;" ng-if="contractFuelVendor && baseTenant">Tenant/CAA</div>
748   - <!-- <select class="form-control" ng-model="order.source" style="width: 100%;">
749   - <option value="" disabled selected hidden>Select Source</option>
750   - <option value="Tenant">Tenant</option>
751   - <option value="CAA">CAA</option>
752   - <option value="Tenant/CAA">Tenant/CAA</option>
753   - </select> -->
754 682 </div>
755 683 <div class="clearfix"></div>
756 684 </div>
... ...
app/partials/main/main.controller.js
Diff comments   View file @7f6e3b1
... ... @@ -54,11 +54,6 @@
54 54 **/
55 55  
56 56 var resetTime;
57   - /*function warning(){
58   - //setTimeout(function(){
59   - $('.warning-message').delay(5000).css('display', 'block');
60   - //}, 5000);
61   - }*/
62 57  
63 58 resetTime = setInterval(function(){
64 59 // $('.warning-message').delay(5000).css('display', 'block');
... ... @@ -81,35 +76,8 @@
81 76 }, 7200000);
82 77 })
83 78  
84   -
85   -
86   -// Flight Tracking page code
87   -
88   - /*$scope.reloadPage = function(){
89   - console.log("if",$state)
90   - console.log("=========state name",$state.current.name);
91   - // $state.go('app.flightTracking', {}, {reload: 'app.flightTracking'})
92   - //$state.go($state.current, {}, {reload: true});
93   -
94   - if($state.current.name != "app.flightTracking"){
95   - $window.location.href = '/#!/flightTracking';
96   - setInterval(function(){
97   - console.log("come")
98   - $window.location.reload()
99   - },10);
100   - }else{
101   - console.log("flight tracking state found=====");
102   - $window.location.reload();
103   - }
104   - }*/
105   -
106   - // Set timeout variables.
107   -
108 79 }
109   - //var timoutWarning = 840000; // Display warning in 14 Mins.
110   - //var timoutNow = 900000; // Timeout in 15 mins.
111   -
112   -
  80 +
113 81  
114 82  
115 83 })();
... ...
app/partials/scheduler/scheduler.controller.js
Diff comments   View file @7f6e3b1
... ... @@ -12,6 +12,7 @@ angular.module(&#39;acufuel&#39;)
12 12 $scope.events = [];
13 13 function getEventsList(){
14 14 schedulerService.getEvents().then(function(result) {
  15 + console.log("===events==",result)
15 16  
16 17 for (var i = 0; i < result.length; i++) {
17 18 var newTime = new Date(result[i].deployDate);
... ...
app/partials/scheduler/scheduler.html
Diff comments   View file @7f6e3b1
... ... @@ -124,14 +124,8 @@
124 124  
125 125 <!-- <div ui-calendar="uiConfig.calendar" ng-model="eventSources" class="col-xs-12 col-md-9" data-drop="true" jqyoui-droppable="{multiple:true, onDrop: 'addEvent($index)'}"></div> -->
126 126  
127   -
128   -
129   -
130   -
131 127 </div>
132 128  
133   -
134   -
135 129 </div>
136 130  
137 131 </div>
... ... @@ -200,4 +194,4 @@
200 194 </form>
201 195  
202 196 </div>
203   -</div>
204 197 \ No newline at end of file
  198 +</div>
... ...
app/partials/updateFuelManager/updateFuelManager.controller.js
Diff comments   View file @7f6e3b1
... ... @@ -205,18 +205,6 @@
205 205 $scope.deleteTierObject = {};
206 206 }
207 207  
208   - /*$scope.deleteVtypeTier = function(id, jetid, index){
209   - $scope.showLoader = true;
210   - updateFuelManagerService.deleteTier(id).then(function(result) {
211   - toastr.success(''+result.success+'', {
212   - closeButton: true
213   - })
214   - updateFuelManagerService.getJetTiers(jetid).then(function(tiers) {
215   - $scope.vTypeJets[index].tierList = tiers;
216   - $scope.showLoader = false;
217   - })
218   - })
219   - }*/
220 208  
221 209 $scope.deleteVtypeTierObject = {};
222 210 $scope.deleteVtypeTier = function(id, jetid, index){
... ...
app/partials/viewCompany/viewCompany.controller.js
Diff comments   View file @7f6e3b1
... ... @@ -132,15 +132,6 @@ angular.module(&#39;acufuel&#39;)
132 132  
133 133 }
134 134  
135   - // $scope.selected =[
136   - // {'id': 1, 'first': 'Tenant/Base Customer'},
137   - // {'id': 2, 'first': 'FuelerLinx Customer'},
138   - // {'id': 3, 'first': 'CAA Member'}
139   - // ];
140   -
141   - // CustomersService.getMargin().then(function(result) {
142   - // $scope.marginList = result;
143   - // })
144 135  
145 136 var value = "";
146 137 var companyId = $stateParams.id;
... ... @@ -848,28 +839,8 @@ angular.module(&#39;acufuel&#39;)
848 839 }
849 840 }
850 841  
851   -
852   - //--fuel type based on tail is not in use--
853   - // $scope.aircraftData = {}
854   - /*$scope.checkJetWithTail = function(tail, index) {
855   -
856   - console.log("tail==============",tail, index)
857   - ViewCompanyService.checkJetType(tail).then(function(result) {
858   - console.log("result",result)
859   - if (result.jetA == "true") {
860   - $scope.jetShow[index] = false;
861   - $scope.marginShow[index] = true;
862   - } else {
863   - $scope.jetShow[index] = true;
864   - $scope.marginShow[index] = false;
865   - }
866   - })
867   - }*/
868   -
869   -
870 842 /*add a fuel order*/
871 843  
872   -
873 844 $scope.getOrders = function() {
874 845 fuelOrdersService.getOrders().then(function(result) {
875 846  
... ...
app/partials/viewFuelVendor/viewFuelVendor.service.js
Diff comments   View file @7f6e3b1
... ... @@ -266,22 +266,6 @@
266 266 return deferred.promise;
267 267 }
268 268  
269   - /*this.omitDeleteVendorFuel = function(id) {
270   -
271   - var deferred = $q.defer();
272   - $http({
273   - method : 'DELETE',
274   - url : BASE_URL.url +'/vendor/omitData/'+id,
275   - headers : {'Content-Type': 'application/json'},
276   - })
277   - .then(function (result){
278   - deferred.resolve(result.data);
279   - },function (result){
280   - deferred.resolve(result.data);
281   - })
282   - return deferred.promise;
283   - } */
284   -
285 269 this.omitDeleteVendorFuel = function(data){
286 270 var deferred = $q.defer();
287 271 $http({
... ...