viithiisys / Acufuel

Download as
Browse Code ยป

Commit 302b19c4eea4d4e9560b8534d133418604a9a2d9

Authored by Kuldeep Arora
1 parent b033133c1d
Exists in master

updates

Showing 5 changed files with 37 additions and 27 deletions   Show diff stats
... ... @@ -333,3 +333,10 @@ right: 120px;
333 333  
334 334  
335 335 /* login page css */
  336 +
  337 +.table.vertical-center > thead > tr > th, .table.vertical-center > tbody > tr > th, .table.vertical-center > tfoot > tr > th, .table.vertical-center > thead > tr > td, .table.vertical-center > tbody > tr > td, .table.vertical-center > tfoot > tr > td{
  338 + vertical-align: middle !important;
  339 +}
  340 +.checkLabel:last-child>span{
  341 + display: none;
  342 +}
336 343 \ No newline at end of file
... ...
app/partials/fuelManager/fuelManager.controller.js
Diff comments   View file @302b19c
... ... @@ -30,7 +30,7 @@
30 30  
31 31 fuelManagerService.getFullList().then(function(result) {
32 32 $scope.fullJetList = result;
33   - console.log('$scope.fullJetList', $scope.fullJetList);
  33 + // console.log('$scope.fullJetList', $scope.fullJetList);
34 34 for (var i = 0; i<$scope.fullJetList.length; i++) {
35 35 for (var j = 0; j<$scope.fullJetList[i].aircraftsSize.length; j++) {
36 36 if ($scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance != null) {
... ... @@ -40,7 +40,7 @@
40 40 var dday = newTime.getUTCDate();
41 41 var dyear = newTime.getUTCFullYear();
42 42 $scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate = dmonth+'/'+dday+'/'+dyear;
43   - console.log('$scope.fullJetList.aircraftsSize.rampFeesAndAvoidance.expirationDate', $scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate);
  43 + // console.log('$scope.fullJetList.aircraftsSize.rampFeesAndAvoidance.expirationDate', $scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate);
44 44 }
45 45 }
46 46 }
... ... @@ -85,7 +85,7 @@
85 85 })
86 86 fuelManagerService.getFullList().then(function(result) {
87 87 $scope.fullJetList = result;
88   - console.log('$scope.fullJetList', $scope.fullJetList);
  88 + // console.log('$scope.fullJetList', $scope.fullJetList);
89 89 for (var i = 0; i<$scope.fullJetList.length; i++) {
90 90 for (var j = 0; j<$scope.fullJetList[i].aircraftsSize.length; j++) {
91 91 if ($scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance != null) {
... ... @@ -95,7 +95,7 @@
95 95 var dday = newTime.getUTCDate();
96 96 var dyear = newTime.getUTCFullYear();
97 97 $scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate = dmonth+'/'+dday+'/'+dyear;
98   - console.log('$scope.fullJetList.aircraftsSize.rampFeesAndAvoidance.expirationDate', $scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate);
  98 + // console.log('$scope.fullJetList.aircraftsSize.rampFeesAndAvoidance.expirationDate', $scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate);
99 99 }
100 100 }
101 101 }
... ... @@ -112,7 +112,7 @@
112 112  
113 113 fuelManagerService.getOptions().then(function(result) {
114 114 $scope.dropOptions = result;
115   - console.log('$scope.dropOptions', $scope.dropOptions);
  115 + // console.log('$scope.dropOptions', $scope.dropOptions);
116 116 })
117 117  
118 118 fuelManagerService.getAircrafts().then(function(result) {
... ... @@ -159,7 +159,7 @@
159 159 $scope.showWingspanForm = false;
160 160 $scope.showTailForm = false;
161 161 $scope.customMakeData = $scope.OldRampData;
162   - console.log('$scope.customMakeData', $scope.customMakeData);
  162 + // console.log('$scope.customMakeData', $scope.customMakeData);
163 163 }else if ($scope.customRampDataCraft.aircraftType === 'WINGSPAN') {
164 164 $scope.showWeightForm = false;
165 165 $scope.showMakeModelForm = false;
... ... @@ -220,7 +220,7 @@
220 220 $scope.openRampFeeModal = false;
221 221 fuelManagerService.getFullList().then(function(result) {
222 222 $scope.fullJetList = result;
223   - console.log('$scope.fullJetList', $scope.fullJetList);
  223 + // console.log('$scope.fullJetList', $scope.fullJetList);
224 224 for (var i = 0; i<$scope.fullJetList.length; i++) {
225 225 for (var j = 0; j<$scope.fullJetList[i].aircraftsSize.length; j++) {
226 226 if ($scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance != null) {
... ... @@ -230,7 +230,7 @@
230 230 var dday = newTime.getUTCDate();
231 231 var dyear = newTime.getUTCFullYear();
232 232 $scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate = dmonth+'/'+dday+'/'+dyear;
233   - console.log('$scope.fullJetList.aircraftsSize.rampFeesAndAvoidance.expirationDate', $scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate);
  233 + // console.log('$scope.fullJetList.aircraftsSize.rampFeesAndAvoidance.expirationDate', $scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate);
234 234 }
235 235 }
236 236 }
... ... @@ -245,7 +245,7 @@
245 245 $scope.deleteCustomJet = function(id){
246 246 $('#confirm1').css('display', 'block');
247 247 $scope.deleteTemplateId = id;
248   - console.log('$scope.deleteTemplateId', id);
  248 + // console.log('$scope.deleteTemplateId', id);
249 249 }
250 250  
251 251 $scope.saveAndCloseConfirm = function(){
... ... @@ -254,7 +254,7 @@
254 254 fuelManagerService.deleteCustomRamp($scope.deleteTemplateId).then(function(result) {
255 255 fuelManagerService.getFullList().then(function(result) {
256 256 $scope.fullJetList = result;
257   - console.log('$scope.fullJetList', $scope.fullJetList);
  257 + // console.log('$scope.fullJetList', $scope.fullJetList);
258 258 for (var i = 0; i<$scope.fullJetList.length; i++) {
259 259 for (var j = 0; j<$scope.fullJetList[i].aircraftsSize.length; j++) {
260 260 if ($scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance != null) {
... ... @@ -264,7 +264,7 @@
264 264 var dday = newTime.getUTCDate();
265 265 var dyear = newTime.getUTCFullYear();
266 266 $scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate = dmonth+'/'+dday+'/'+dyear;
267   - console.log('$scope.fullJetList.aircraftsSize.rampFeesAndAvoidance.expirationDate', $scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate);
  267 + //console.log('$scope.fullJetList.aircraftsSize.rampFeesAndAvoidance.expirationDate', $scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate);
268 268 }
269 269 }
270 270 }
... ... @@ -337,7 +337,7 @@
337 337 }, 3);
338 338  
339 339 $('#customTabToggle1').click(function(){
340   - console.log('tab 1');
  340 + //console.log('tab 1');
341 341 $('#customTabsBody1').slideDown();
342 342 $('#customTabsBody2').slideUp();
343 343 $('#customTabsBody3').slideUp();
... ... @@ -367,7 +367,7 @@
367 367  
368 368 })
369 369 $('#customTabToggle2').click(function(){
370   - console.log('tab 2');
  370 + // console.log('tab 2');
371 371 $('#customTabsBody1').slideUp();
372 372 $('#customTabsBody2').slideDown();
373 373 $('#customTabsBody3').slideUp();
... ... @@ -397,7 +397,7 @@
397 397  
398 398 })
399 399 $('#customTabToggle3').click(function(){
400   - console.log('tab 3');
  400 + // console.log('tab 3');
401 401 $('#customTabsBody1').slideUp();
402 402 $('#customTabsBody2').slideUp();
403 403 $('#customTabsBody3').slideDown();
... ... @@ -427,7 +427,7 @@
427 427  
428 428 })
429 429 $('#customTabToggle4').click(function(){
430   - console.log('tab 4');
  430 + // console.log('tab 4');
431 431 $('#customTabsBody1').slideUp();
432 432 $('#customTabsBody2').slideUp();
433 433 $('#customTabsBody3').slideUp();
... ...
app/partials/fuelManager/fuelManager.html
Diff comments   View file @302b19c
... ... @@ -70,7 +70,10 @@
70 70 <span style="margin-left: 5px;">{{jets.size}}</span>
71 71 </div>
72 72 <div class="col-md-2">
73   - <input type="text" ng-disabled="jets.rampFeesAndAvoidance.applicable == false || jets.rampFeesAndAvoidance.applicable == null" ng-model="jets.rampFeesAndAvoidance.rampFees" style="padding: 5px 5px;">
  73 + <div style="width: 50px; margin: auto; position: relative;">
  74 + <input type="text" ng-disabled="jets.rampFeesAndAvoidance.applicable == false || jets.rampFeesAndAvoidance.applicable == null" ng-model="jets.rampFeesAndAvoidance.rampFees" placeholder="0.00" style="padding: 5px 5px;">
  75 + <span style="position: absolute; top: 0; left: -10;">$</span>
  76 + </div>
74 77 </div>
75 78 <div class="col-md-2">
76 79 <input type="text" ng-disabled="jets.rampFeesAndAvoidance.applicable == false || jets.rampFeesAndAvoidance.applicable == null" ng-model="jets.rampFeesAndAvoidance.avoidance" style="padding: 5px 5px;">
... ... @@ -108,7 +111,7 @@
108 111 <div class="appliesTableHeading">Applies To:</div>
109 112 <div class="appliesTableBody">
110 113 <div class="firstDiv">
111   - <label style="font-weight: normal;" ng-repeat="aircraftList in jets.aircrafts">{{aircraftList.model}}</label>
  114 + <label style="font-weight: normal;" ng-repeat="aircraftList in jets.aircrafts" class="checkLabel">{{aircraftList.model}}<span>,&nbsp;</span></label>
112 115 </div>
113 116 <div class="lastDiv">
114 117 <textarea ng-model="jets.rampFeesAndAvoidance.notes"></textarea>
... ...
app/partials/main/main.html
Diff comments   View file @302b19c
... ... @@ -58,7 +58,7 @@
58 58 <li>
59 59 <a ui-sref="app.enterFuelOrder">Enter Fuel Order</a>
60 60 </li>
61   - <li><a ui-sref="app.fuelManager" href="#/fuelManager">Ramp Free Manager</a></li>
  61 + <li><a ui-sref="app.fuelManager" href="#/fuelManager">Ramp Fee Manager</a></li>
62 62 <li class="dropdown-submenu">
63 63 <a tabindex="-1" >Tax Manager</a>
64 64 <ul class="dropdown-menu">
... ...
app/partials/updateFuelManager/updateFuelManager.html
Diff comments   View file @302b19c
... ... @@ -30,7 +30,7 @@
30 30 <!-- /widget-header -->
31 31 <div class="widget-content">
32 32 <h4>Deployed Fuel Prices</h4>
33   - <table class="table">
  33 + <table class="table vertical-center">
34 34 <thead>
35 35 <tr>
36 36 <th> Product</th>
... ... @@ -41,7 +41,7 @@
41 41 </tr>
42 42 </thead>
43 43 <tbody>
44   - <tr ng-repeat="fuelPricing in newFuelPricing | filter:{ status: true }">
  44 + <tr ng-repeat="fuelPricing in newFuelPricing | orderBy : 'namejetrest' | filter:{ status: true }">
45 45 <td>
46 46 <span style="color: #2196f3" ng-show="fuelPricing.jeta">{{fuelPricing.name}}</span>
47 47 <span ng-show="fuelPricing.jeta">{{fuelPricing.namejetrest}}</span>
... ... @@ -80,7 +80,7 @@
80 80 <div class="widget-content">
81 81 <h6 style="color:#F90">Queue Pricing for Deployment in the Price Manager below</h6>
82 82 <form>
83   - <table class="table">
  83 + <table class="table vertical-center">
84 84 <thead>
85 85 <tr>
86 86 <th> Product</th>
... ... @@ -92,7 +92,7 @@
92 92 </tr>
93 93 </thead>
94 94 <tbody>
95   - <tr ng-repeat="fuelPricing in newFuelPricing | filter:{ status: true }">
  95 + <tr ng-repeat="fuelPricing in newFuelPricing | orderBy : 'namejetrest' | filter:{ status: true }">
96 96 <td>
97 97 <span style="color: #2196f3" ng-show="fuelPricing.jeta">{{fuelPricing.name}}</span>
98 98 <span ng-show="fuelPricing.jeta">{{fuelPricing.namejetrest}}</span>
... ... @@ -100,10 +100,10 @@
100 100 <span ng-show="fuelPricing.avgas">{{fuelPricing.nameavgasrest}}</span>
101 101 </td>
102 102 <td>
103   - <input type="text" class="form-control" ng-keyup="disableButtons(fuelPricing.futureFuelPricing.cost)" ng-model="fuelPricing.futureFuelPricing.cost" style="height:31px; width: 60px; padding: 6px 6px; font-size:12px;">
  103 + <input type="text" class="form-control" ng-keyup="disableButtons(fuelPricing.futureFuelPricing.cost)" ng-model="fuelPricing.futureFuelPricing.cost" style="height:31px; width: 60px; padding: 6px 6px; font-size:12px;" placeholder="0.0000">
104 104 </td>
105 105 <td>
106   - <input type="text" class="form-control" ng-model="fuelPricing.futureFuelPricing.papMargin" style="height:31px; width: 80px; padding: 6px 6px; font-size:12px;">
  106 + <input type="text" class="form-control" ng-model="fuelPricing.futureFuelPricing.papMargin" style="height:31px; width: 80px; padding: 6px 6px; font-size:12px;" placeholder="0.0000">
107 107 </td>
108 108 <td>
109 109 <input type="text" class="form-control" ng-disabled="fuelPricing.futureFuelPricing.cost == undefined || fuelPricing.futureFuelPricing.cost == null || fuelPricing.futureFuelPricing.cost == ''" datepicker ng-model="fuelPricing.futureFuelPricing.deployDate" style="height:31px; width: 80px; padding: 6px 6px; font-size:12px;">
... ... @@ -155,13 +155,13 @@
155 155 <div ng-repeat="jets in aTypeJets">
156 156 <div class="customAccordianHeader" id="{{jets.id}}">
157 157 <span>{{jets.marginName}}</span>
158   - <select class="form-control" disabled="true" ng-model="jets.pricingStructure">
  158 + <select class="form-control" disabled="true" ng-model="jets.pricingStructure" ng-change="selectChanged($index)">
159 159 <option value="" disabled selected>Pricing Structure</option>
160 160 <option value="minus">Retail/PAP - (minus)</option>
161 161 <option value="plus">Cost + (plus)</option>
162 162 </select>
163 163 <span style="margin-right: 0;">$</span>
164   - <input type="text" disabled="true" class="form-control" ng-model="jets.marginValue">
  164 + <input type="text" disabled="true" class="form-control" ng-model="jets.marginValue" placeholder="0.0000">
165 165 <div class="pull-right">
166 166 <button class="btn btn-success" style="display: none; background-image: none; background-color: #f3f3f3; color: #333; border:0;" ng-click="closeAccordian(jets)">Close</button>
167 167 <button class="btn btn-success" style="display: none;" ng-click="saveJetAccordian(jets)">Save</button>
... ... @@ -267,7 +267,7 @@
267 267 <option value="equal">Direct = (equal)</option>
268 268 </select>
269 269 <span style="margin-right: 0;">$</span>
270   - <input type="text" disabled="true" class="form-control" ng-model="jets.marginValue">
  270 + <input type="text" disabled="true" class="form-control" ng-model="jets.marginValue" placeholder="0.0000">
271 271 <div class="pull-right">
272 272 <button class="btn btn-success" style="display: none; background-image: none; background-color: #f3f3f3; color: #333; border:0;" ng-click="closeAccordianVtype(jets)">Close</button>
273 273 <button class="btn btn-success" style="display: none;" ng-click="saveVtypeJetAccordian(jets)">Save</button>
... ...