Blame view
app/partials/updateFuelManager/updateFuelManager.controller.js
51.1 KB
feacde5ff
setup acuefuel in...
|
1 2 3 4 |
'use strict';
//Load controller
angular.module('acufuel')
|
|
feacde5ff
setup acuefuel in...
|
5 |
|
1097c2ce1
margin module add...
|
6 |
.controller('updateFuelManagerController', ['$scope','$uibModal', 'updateFuelManagerService', function($scope , $uibModal, updateFuelManagerService) {
|
71c760e0c
update Fuel Manag...
|
7 |
$scope.showLoader = true; |
|
4bb02bb84
new integration w...
|
8 |
$scope.yes = function(data){
|
d121d5539
UI Changes
|
9 10 |
// console.log('========');
//console.log('value', data);
|
|
4bb02bb84
new integration w...
|
11 12 13 14 15 16 |
$uibModal.yes({
templateUrl: 'partials/pricingcontact/pricingcontact.html',
backdrop: true,
scope: $scope,
})
}
|
|
e95d89b77
integrate editor ...
|
17 18 19 20 21 22 23 24 25 26 |
$scope.options = {
language: 'en',
allowedContent: true,
entities: false
};
// Called when the editor is completely ready.
$scope.onReady = function () {
// ...
};
|
|
a7c71ad58
price manager aut...
|
27 28 29 |
|
|
1097c2ce1
margin module add...
|
30 |
$scope.userProfileId = JSON.parse(localStorage.getItem('userProfileId'));
|
|
e8983332d
margin accordian ...
|
31 |
|
|
a7c71ad58
price manager aut...
|
32 33 |
function getAtypeFunction(){
updateFuelManagerService.getATypeJets($scope.userProfileId).then(function(result) {
|
|
1b71872b2
email and code be...
|
34 35 36 |
for (var i = 0; i
<result.length; i++) {
|
|
a7c71ad58
price manager aut...
|
37 38 39 40 41 42 43 44 45 46 47 |
result[i].marginValue = parseFloat(result[i].marginValue).toFixed(4);
}
$scope.aTypeJets = result;
$scope.showLoader = false;
})
}
getAtypeFunction();
function getVTypeFunction(){
updateFuelManagerService.getVTypeJets($scope.userProfileId).then(function(result) {
|
|
1b71872b2
email and code be...
|
48 49 50 |
for (var i = 0; i
<result.length; i++) {
|
|
a7c71ad58
price manager aut...
|
51 52 |
result[i].marginValue = parseFloat(result[i].marginValue).toFixed(4);
}
|
|
b90971c06
scheduler and ram...
|
53 |
console.log("get Vtype",result)
|
|
a7c71ad58
price manager aut...
|
54 55 56 57 58 59 60 |
$scope.vTypeJets = result;
$scope.showLoader = false;
})
}
getVTypeFunction();
|
|
8707ba5fd
fuel manager done
|
61 |
$scope.toggleJestAccordian = function(id, index){
|
|
32286a73a
tier issue resolved
|
62 |
$scope.showLoader = true; |
|
1097c2ce1
margin module add...
|
63 64 65 66 67 |
$('.'+id).slideDown();
$('#'+id).addClass('customActive');
$('#'+id+' select, #'+id+' input').prop("disabled", false);
$('#'+id+' .btn-success, #'+id+' .btn-danger').css('display', 'inline-block');
$('#'+id+' .btn-default').css('display', 'none');
|
|
71c760e0c
update Fuel Manag...
|
68 |
$('#'+id+' .btn-primary').css('display', 'none');
|
|
8707ba5fd
fuel manager done
|
69 |
|
|
05c2f6fb3
margin module and...
|
70 |
updateFuelManagerService.getJetTiers(id).then(function(tiers) {
|
|
8707ba5fd
fuel manager done
|
71 |
$scope.aTypeJets[index].tierList = tiers; |
|
32286a73a
tier issue resolved
|
72 |
$scope.showLoader = false; |
|
05c2f6fb3
margin module and...
|
73 74 |
})
}
|
|
8707ba5fd
fuel manager done
|
75 |
$scope.toggleVtypeJestAccordian = function(id, index){
|
|
32286a73a
tier issue resolved
|
76 |
$scope.showLoader = true; |
|
8707ba5fd
fuel manager done
|
77 78 79 80 81 |
$('.'+id).slideDown();
$('#'+id).addClass('customActive');
$('#'+id+' select, #'+id+' input').prop("disabled", false);
$('#'+id+' .btn-success, #'+id+' .btn-danger').css('display', 'inline-block');
$('#'+id+' .btn-default').css('display', 'none');
|
|
71c760e0c
update Fuel Manag...
|
82 |
$('#'+id+' .btn-primary').css('display', 'none');
|
|
8707ba5fd
fuel manager done
|
83 84 85 |
updateFuelManagerService.getJetTiers(id).then(function(tiers) {
$scope.vTypeJets[index].tierList = tiers;
|
|
32286a73a
tier issue resolved
|
86 |
$scope.showLoader = false; |
|
8707ba5fd
fuel manager done
|
87 88 89 90 |
})
}
//$scope.trData = {};
$scope.addNewTier = function(id, trData, index){
|
|
32286a73a
tier issue resolved
|
91 |
$scope.showLoader = true; |
|
8707ba5fd
fuel manager done
|
92 93 94 95 96 97 98 |
$scope.tr = {};
$scope.tr[index] = {};
$scope.tr[index].minTierBreak = trData[index].minTierBreak;
$scope.tr[index].maxTierBreak = trData[index].maxTierBreak;
$scope.tr[index].margin = trData[index].margin;
$scope.tr[index].marginTotal = '1.00';
$scope.tr[index].marginTemplateId = id;
|
|
05c2f6fb3
margin module and...
|
99 |
|
|
8707ba5fd
fuel manager done
|
100 101 102 103 104 105 106 107 108 109 |
var tierData = 'minTierBreak='+$scope.tr[index].minTierBreak+'&maxTierBreak='+$scope.tr[index].maxTierBreak+'&margin='+$scope.tr[index].margin+
'&marginTotal='+$scope.tr[index].marginTotal+'&marginTemplateId='+$scope.tr[index].marginTemplateId;
updateFuelManagerService.addNewTier(tierData).then(function(result) {
toastr.success('Successfully Added', {
closeButton: true
})
trData[index].minTierBreak = '';
trData[index].maxTierBreak = '';
trData[index].margin = '';
|
|
32286a73a
tier issue resolved
|
110 |
|
|
8707ba5fd
fuel manager done
|
111 112 |
updateFuelManagerService.getJetTiers(id).then(function(tiers) {
$scope.aTypeJets[index].tierList = tiers;
|
|
32286a73a
tier issue resolved
|
113 |
$scope.showLoader = false; |
|
8707ba5fd
fuel manager done
|
114 115 116 |
})
})
}
|
|
05c2f6fb3
margin module and...
|
117 |
|
|
8707ba5fd
fuel manager done
|
118 |
$scope.addNewVtypeTier = function(id, vtrData, index){
|
|
32286a73a
tier issue resolved
|
119 |
$scope.showLoader = true; |
|
8707ba5fd
fuel manager done
|
120 121 122 123 124 125 126 127 128 129 130 |
$scope.tr = {};
$scope.tr[index] = {};
$scope.tr[index].minTierBreak = vtrData[index].minTierBreak;
$scope.tr[index].maxTierBreak = vtrData[index].maxTierBreak;
$scope.tr[index].margin = vtrData[index].margin;
$scope.tr[index].marginTotal = '1.00';
$scope.tr[index].marginTemplateId = id;
var tierData = 'minTierBreak='+$scope.tr[index].minTierBreak+'&maxTierBreak='+$scope.tr[index].maxTierBreak+'&margin='+$scope.tr[index].margin+
'&marginTotal='+$scope.tr[index].marginTotal+'&marginTemplateId='+$scope.tr[index].marginTemplateId;
|
|
05c2f6fb3
margin module and...
|
131 132 133 134 |
updateFuelManagerService.addNewTier(tierData).then(function(result) {
toastr.success('Successfully Added', {
closeButton: true
})
|
|
8707ba5fd
fuel manager done
|
135 136 137 |
vtrData[index].minTierBreak = '';
vtrData[index].maxTierBreak = '';
vtrData[index].margin = '';
|
|
05c2f6fb3
margin module and...
|
138 |
updateFuelManagerService.getJetTiers(id).then(function(tiers) {
|
|
8707ba5fd
fuel manager done
|
139 |
$scope.vTypeJets[index].tierList = tiers; |
|
32286a73a
tier issue resolved
|
140 |
$scope.showLoader = false; |
|
05c2f6fb3
margin module and...
|
141 142 143 |
})
})
}
|
|
32286a73a
tier issue resolved
|
144 145 |
$scope.editTier = function(tier, index){
$scope.showLoader = true;
|
|
05c2f6fb3
margin module and...
|
146 147 148 149 150 151 152 153 |
var editTierData = 'minTierBreak='+tier.minTierBreak+'&maxTierBreak='+tier.maxTierBreak+'&margin='+tier.margin+
'&marginTotal='+tier.marginTotal+'&marginTemplateId='+tier.marginTemplate.id+'&marginId='+tier.id;
updateFuelManagerService.editTier(editTierData).then(function(result) {
toastr.success('Successfully Updated', {
closeButton: true
})
updateFuelManagerService.getJetTiers(tier.marginTemplate.id).then(function(tiers) {
|
|
32286a73a
tier issue resolved
|
154 155 |
$scope.aTypeJets[index].tierList = tiers;
$scope.showLoader = false;
|
|
05c2f6fb3
margin module and...
|
156 157 158 159 |
})
})
}
|
|
32286a73a
tier issue resolved
|
160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 |
$scope.editVtypeTier = function(tier, index){
$scope.showLoader = true;
var editTierData = 'minTierBreak='+tier.minTierBreak+'&maxTierBreak='+tier.maxTierBreak+'&margin='+tier.margin+
'&marginTotal='+tier.marginTotal+'&marginTemplateId='+tier.marginTemplate.id+'&marginId='+tier.id;
updateFuelManagerService.editTier(editTierData).then(function(result) {
toastr.success('Successfully Updated', {
closeButton: true
})
updateFuelManagerService.getJetTiers(tier.marginTemplate.id).then(function(tiers) {
$scope.vTypeJets[index].tierList = tiers;
$scope.showLoader = false;
})
})
}
|
|
a9e3a7365
fix issues on vie...
|
176 |
$scope.deleteTierObject = {};
|
|
32286a73a
tier issue resolved
|
177 |
$scope.deleteTier = function(id, jetid, index){
|
|
a9e3a7365
fix issues on vie...
|
178 179 180 181 182 183 184 |
$scope.deleteTierObject.id = id;
$scope.deleteTierObject.jetId = jetid;
$scope.deleteTierObject.index = index;
$('#deleteTierConfirm').css('display', 'block');
}
$scope.confirmDeleteTier = function(){
|
|
32286a73a
tier issue resolved
|
185 |
$scope.showLoader = true; |
|
a9e3a7365
fix issues on vie...
|
186 |
updateFuelManagerService.deleteTier($scope.deleteTierObject.id).then(function(result) {
|
|
90e918562
delete tier done
|
187 |
toastr.success(''+result.success+'', {
|
|
05c2f6fb3
margin module and...
|
188 189 |
closeButton: true
})
|
|
d121d5539
UI Changes
|
190 |
// console.log("--tier id custom",$scope.deleteTierObject.id)
|
|
a9e3a7365
fix issues on vie...
|
191 192 |
updateFuelManagerService.getJetTiers($scope.deleteTierObject.jetId).then(function(tiers) {
$scope.aTypeJets[$scope.deleteTierObject.index].tierList = tiers;
|
|
32286a73a
tier issue resolved
|
193 |
$scope.showLoader = false; |
|
a9e3a7365
fix issues on vie...
|
194 |
$scope.deleteTierObject = {};
|
|
32286a73a
tier issue resolved
|
195 196 |
})
})
|
|
a9e3a7365
fix issues on vie...
|
197 |
$('#deleteTierConfirm').css('display', 'none');
|
|
32286a73a
tier issue resolved
|
198 |
} |
|
a9e3a7365
fix issues on vie...
|
199 |
$scope.cancelTierDelete = function(){
|
|
d121d5539
UI Changes
|
200 |
// console.log('cancel');
|
|
a9e3a7365
fix issues on vie...
|
201 202 203 204 205 |
$('#deleteTierConfirm').css('display', 'none');
$scope.deleteTierObject = {};
}
/*$scope.deleteVtypeTier = function(id, jetid, index){
|
|
32286a73a
tier issue resolved
|
206 207 208 209 210 211 212 213 |
$scope.showLoader = true;
updateFuelManagerService.deleteTier(id).then(function(result) {
toastr.success(''+result.success+'', {
closeButton: true
})
updateFuelManagerService.getJetTiers(jetid).then(function(tiers) {
$scope.vTypeJets[index].tierList = tiers;
$scope.showLoader = false;
|
|
05c2f6fb3
margin module and...
|
214 215 |
})
})
|
|
a9e3a7365
fix issues on vie...
|
216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 |
}*/
$scope.deleteVtypeTierObject = {};
$scope.deleteVtypeTier = function(id, jetid, index){
$scope.deleteVtypeTierObject.id = id;
$scope.deleteVtypeTierObject.jetId = jetid;
$scope.deleteVtypeTierObject.index = index;
$('#deleteVtypeTierConfirm').css('display', 'block');
}
$scope.confirmDeleteVtypeTier = function(){
$scope.showLoader = true;
updateFuelManagerService.deleteTier($scope.deleteVtypeTierObject.id).then(function(result) {
toastr.success(''+result.success+'', {
closeButton: true
})
updateFuelManagerService.getJetTiers($scope.deleteVtypeTierObject.jetId).then(function(tiers) {
$scope.vTypeJets[$scope.deleteVtypeTierObject.index].tierList = tiers;
$scope.showLoader = false;
$scope.deleteVtypeTierObject = {};
})
})
$('#deleteVtypeTierConfirm').css('display', 'none');
}
$scope.cancelVtypeTierDelete = function(){
|
|
d121d5539
UI Changes
|
242 |
// console.log('cancel');
|
|
a9e3a7365
fix issues on vie...
|
243 244 |
$('#deleteVtypeTierConfirm').css('display', 'none');
$scope.deleteVtypeTierObject = {};
|
|
1097c2ce1
margin module add...
|
245 |
} |
|
e8983332d
margin accordian ...
|
246 |
|
|
1097c2ce1
margin module add...
|
247 |
$scope.saveJetAccordian = function(jets){
|
|
32286a73a
tier issue resolved
|
248 |
$scope.showLoader = true; |
|
1097c2ce1
margin module add...
|
249 250 251 252 253 254 255 256 |
$scope.jetsDetail = jets;
$scope.jetsDetail.userProfileId = $scope.userProfileId;
//console.log('jets', $scope.jetsDetail);
$('.'+$scope.jetsDetail.id).slideUp();
$('#'+$scope.jetsDetail.id).removeClass('customActive');
$('#'+$scope.jetsDetail.id+' select, #'+$scope.jetsDetail.id+' input').prop("disabled", true);
$('#'+$scope.jetsDetail.id+' .btn-success, #'+$scope.jetsDetail.id+' .btn-danger').css('display', 'none');
$('#'+$scope.jetsDetail.id+' .btn-default').css('display', 'inline-block');
|
|
71c760e0c
update Fuel Manag...
|
257 |
$('#'+$scope.jetsDetail.id+' .btn-primary').css('display', 'inline-block');
|
|
1097c2ce1
margin module add...
|
258 |
|
|
9732e9b36
updates in fuel m...
|
259 |
var editJetData = 'productType='+$scope.jetsDetail.productType+'&marginName='+$scope.jetsDetail.marginName+'&pricingStructure='+$scope.jetsDetail.pricingStructure+'&marginValue='+$scope.jetsDetail.marginValue+'&userProfileId='+$scope.jetsDetail.userProfileId+'&marginId='+$scope.jetsDetail.id+'&message='+$scope.jetsDetail.message; |
|
1097c2ce1
margin module add...
|
260 261 |
updateFuelManagerService.editAtypeJetMargin(editJetData).then(function(result) {
|
|
d121d5539
UI Changes
|
262 |
// console.log('newJet', editJetData);
|
|
1097c2ce1
margin module add...
|
263 264 265 |
toastr.success('Successfully Updated', {
closeButton: true
})
|
|
a7c71ad58
price manager aut...
|
266 267 |
/*updateFuelManagerService.getATypeJets($scope.userProfileId).then(function(result) {
console.log('result for margin', result);
|
|
1097c2ce1
margin module add...
|
268 |
$scope.aTypeJets = result; |
|
32286a73a
tier issue resolved
|
269 |
$scope.showLoader = false; |
|
a7c71ad58
price manager aut...
|
270 271 |
})*/
getAtypeFunction();
|
|
e8983332d
margin accordian ...
|
272 |
}) |
|
e8983332d
margin accordian ...
|
273 |
|
|
1097c2ce1
margin module add...
|
274 |
} |
|
e95d89b77
integrate editor ...
|
275 276 277 278 279 280 |
$scope.closeAccordian = function(jets){
$('.'+jets.id).slideUp();
$('#'+jets.id).removeClass('customActive');
$('#'+jets.id+' select, #'+jets.id+' input').prop("disabled", true);
$('#'+jets.id+' .btn-success, #'+jets.id+' .btn-danger').css('display', 'none');
$('#'+jets.id+' .btn-default').css('display', 'inline-block');
|
|
71c760e0c
update Fuel Manag...
|
281 |
$('#'+jets.id+' .btn-primary').css('display', 'inline-block');
|
|
e95d89b77
integrate editor ...
|
282 283 284 285 286 287 288 289 |
}
$scope.closeAccordianVtype = function(jets){
$('.'+jets.id).slideUp();
$('#'+jets.id).removeClass('customActive');
$('#'+jets.id+' select, #'+jets.id+' input').prop("disabled", true);
$('#'+jets.id+' .btn-success, #'+jets.id+' .btn-danger').css('display', 'none');
$('#'+jets.id+' .btn-default').css('display', 'inline-block');
|
|
71c760e0c
update Fuel Manag...
|
290 |
$('#'+jets.id+' .btn-primary').css('display', 'inline-block');
|
|
e95d89b77
integrate editor ...
|
291 |
} |
|
8707ba5fd
fuel manager done
|
292 |
$scope.saveVtypeJetAccordian = function(jets){
|
|
32286a73a
tier issue resolved
|
293 |
$scope.showLoader = true; |
|
8707ba5fd
fuel manager done
|
294 295 296 297 298 299 300 301 |
$scope.jetsDetail = jets;
$scope.jetsDetail.userProfileId = $scope.userProfileId;
//console.log('jets', $scope.jetsDetail);
$('.'+$scope.jetsDetail.id).slideUp();
$('#'+$scope.jetsDetail.id).removeClass('customActive');
$('#'+$scope.jetsDetail.id+' select, #'+$scope.jetsDetail.id+' input').prop("disabled", true);
$('#'+$scope.jetsDetail.id+' .btn-success, #'+$scope.jetsDetail.id+' .btn-danger').css('display', 'none');
$('#'+$scope.jetsDetail.id+' .btn-default').css('display', 'inline-block');
|
|
71c760e0c
update Fuel Manag...
|
302 |
$('#'+jets.id+' .btn-primary').css('display', 'inline-block');
|
|
8707ba5fd
fuel manager done
|
303 |
|
|
9732e9b36
updates in fuel m...
|
304 |
var editVtypeJetData = 'productType='+$scope.jetsDetail.productType+'&marginName='+$scope.jetsDetail.marginName+'&pricingStructure='+$scope.jetsDetail.pricingStructure+'&marginValue='+$scope.jetsDetail.marginValue+'&userProfileId='+$scope.jetsDetail.userProfileId+'&marginId='+$scope.jetsDetail.id+'&message='+$scope.jetsDetail.message; |
|
8707ba5fd
fuel manager done
|
305 306 |
updateFuelManagerService.editVtypeJetMargin(editVtypeJetData).then(function(result) {
|
|
d121d5539
UI Changes
|
307 |
//console.log('newJet', editVtypeJetData);
|
|
8707ba5fd
fuel manager done
|
308 309 310 |
toastr.success('Successfully Updated', {
closeButton: true
})
|
|
a7c71ad58
price manager aut...
|
311 |
/* updateFuelManagerService.getVTypeJets($scope.userProfileId).then(function(result) {
|
|
8707ba5fd
fuel manager done
|
312 |
$scope.vTypeJets = result; |
|
d121d5539
UI Changes
|
313 |
//console.log('second jets', result);
|
|
32286a73a
tier issue resolved
|
314 |
$scope.showLoader = false; |
|
a7c71ad58
price manager aut...
|
315 316 |
})*/
getVTypeFunction();
|
|
8707ba5fd
fuel manager done
|
317 318 319 320 321 |
})
}
$scope.newJet = {};
|
|
1097c2ce1
margin module add...
|
322 323 324 325 326 |
$scope.addNewMarginBtn = function(){
$('.addNewMargin').css('display', 'block');
}
$scope.closeMarginPopup = function(){
$('.addNewMargin').css('display', 'none');
|
|
8707ba5fd
fuel manager done
|
327 |
$scope.newJet = {};
|
|
1097c2ce1
margin module add...
|
328 |
} |
|
8707ba5fd
fuel manager done
|
329 |
//$scope.newJet.productType = ''; |
|
1097c2ce1
margin module add...
|
330 331 |
$scope.addNewATypeJet = function(){
|
|
32286a73a
tier issue resolved
|
332 |
$scope.showLoader = true; |
|
1097c2ce1
margin module add...
|
333 334 |
$scope.newJet.productType = 'JET-A';
$scope.newJet.userProfileId = $scope.userProfileId;
|
|
9732e9b36
updates in fuel m...
|
335 |
var jetData = 'productType='+$scope.newJet.productType+'&marginName='+$scope.newJet.marginName+'&pricingStructure='+$scope.newJet.pricingStructure+'&marginValue='+$scope.newJet.marginValue+'&userProfileId='+$scope.newJet.userProfileId+'&message='+$scope.newJet.message; |
|
1097c2ce1
margin module add...
|
336 337 |
updateFuelManagerService.addNewAtypeJetMargin(jetData).then(function(result) {
|
|
a7c71ad58
price manager aut...
|
338 |
//console.log('newJet', jetData);
|
|
1097c2ce1
margin module add...
|
339 340 341 342 |
toastr.success('Successfully Added', {
closeButton: true
})
$('.addNewMargin').css('display', 'none');
|
|
a7c71ad58
price manager aut...
|
343 344 |
/* updateFuelManagerService.getATypeJets($scope.userProfileId).then(function(result) {
console.log('result', result);
|
|
1097c2ce1
margin module add...
|
345 |
$scope.aTypeJets = result; |
|
32286a73a
tier issue resolved
|
346 |
$scope.showLoader = false; |
|
a7c71ad58
price manager aut...
|
347 348 |
})*/
getAtypeFunction();
|
|
e8983332d
margin accordian ...
|
349 |
}) |
|
1097c2ce1
margin module add...
|
350 |
} |
|
e8983332d
margin accordian ...
|
351 |
|
|
8707ba5fd
fuel manager done
|
352 353 354 355 356 357 358 359 360 361 362 |
$scope.newVtypeJet = {};
$scope.addNewVtypePop = function(){
$('.addNewVtype').css('display', 'block');
}
$scope.closeNewVtypePop = function(){
$('.addNewVtype').css('display', 'none');
$scope.newVtypeJet = {};
}
$scope.addNewVTypeJet = function(){
|
|
32286a73a
tier issue resolved
|
363 |
$scope.showLoader = true; |
|
8707ba5fd
fuel manager done
|
364 365 |
$scope.newVtypeJet.productType = 'AVGAS';
$scope.newVtypeJet.userProfileId = $scope.userProfileId;
|
|
9732e9b36
updates in fuel m...
|
366 |
var vJetData = 'productType='+$scope.newVtypeJet.productType+'&marginName='+$scope.newVtypeJet.marginName+'&pricingStructure='+$scope.newVtypeJet.pricingStructure+'&marginValue='+$scope.newVtypeJet.marginValue+'&userProfileId='+$scope.newVtypeJet.userProfileId+'&message='+$scope.newVtypeJet.message; |
|
8707ba5fd
fuel manager done
|
367 368 |
updateFuelManagerService.addNewVtypeJet(vJetData).then(function(result) {
|
|
b90971c06
scheduler and ram...
|
369 |
console.log("AVGAS data",vJetData)
|
|
8707ba5fd
fuel manager done
|
370 371 372 373 374 |
toastr.success('Successfully Added', {
closeButton: true
})
$('.addNewVtype').css('display', 'none');
|
|
a7c71ad58
price manager aut...
|
375 |
/*updateFuelManagerService.getVTypeJets($scope.userProfileId).then(function(result) {
|
|
8707ba5fd
fuel manager done
|
376 |
$scope.vTypeJets = result; |
|
32286a73a
tier issue resolved
|
377 |
$scope.showLoader = false; |
|
a7c71ad58
price manager aut...
|
378 379 |
})*/
getVTypeFunction();
|
|
8707ba5fd
fuel manager done
|
380 381 382 |
})
}
|
|
bfbbd8668
UI service
|
383 384 385 |
/*Jet A Margin Email Send */
$scope.emailForJetMargin;
$scope.emailPricingForJetAMargin = function(value){
|
|
ebcdbb65b
update Fuel Manag...
|
386 |
$('#confirm2').css('display', 'block');
|
|
bfbbd8668
UI service
|
387 |
$scope.emailForJetMargin = value; |
|
ebcdbb65b
update Fuel Manag...
|
388 389 390 391 |
}
$scope.saveAndCloseForMarginConfirm = function(){
$('#confirm2').css('display', 'none');
|
|
bfbbd8668
UI service
|
392 393 |
updateFuelManagerService.sendMailToJetAMargin($scope.emailForJetMargin).then(function(result) {
console.log("email margin jeta",$scope.emailForJetMargin)
|
|
ebcdbb65b
update Fuel Manag...
|
394 395 396 397 398 399 400 401 |
toastr.success(''+result.success+'', {
closeButton: true
})
})
}
$scope.cancelAndCloseForMarginConfirm = function(){
$('#confirm2').css('display', 'none');
}
|
|
8707ba5fd
fuel manager done
|
402 |
|
|
bfbbd8668
UI service
|
403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 |
/*AVGAS Margin Email Send */
$scope.emailForAVGASMargin;
$scope.emailPricingForAVGASMargin = function(value){
$('#confirm3').css('display', 'block');
$scope.emailForAVGASMargin = value;
}
$scope.saveAndCloseForAVGASMarginConfirm = function(){
$('#confirm3').css('display', 'none');
updateFuelManagerService.sendMailToAVGASMargin($scope.emailForAVGASMargin).then(function(result) {
console.log("email margin avgas",$scope.emailForAVGASMargin)
toastr.success(''+result.success+'', {
closeButton: true
})
})
}
$scope.cancelAndCloseForAVGASMarginConfirm = function(){
$('#confirm3').css('display', 'none');
}
|
|
882908c84
fuel pricing modu...
|
423 |
$scope.sendEmail = {};
|
|
1097c2ce1
margin module add...
|
424 |
|
|
882908c84
fuel pricing modu...
|
425 |
$scope.confirmMail = function(){
|
|
9732e9b36
updates in fuel m...
|
426 |
if ($scope.sendEmail.pricing != '' && $scope.sendEmail.pricing != null && $scope.sendEmail.pricing != undefined) {
|
|
882908c84
fuel pricing modu...
|
427 |
$('#confirm1').css('display', 'block');
|
|
bfbbd8668
UI service
|
428 |
|
|
882908c84
fuel pricing modu...
|
429 430 |
}
}
|
|
9732e9b36
updates in fuel m...
|
431 |
|
|
882908c84
fuel pricing modu...
|
432 433 |
$scope.saveAndCloseConfirm = function(){
$('#confirm1').css('display', 'none');
|
|
ebcdbb65b
update Fuel Manag...
|
434 |
updateFuelManagerService.sendMailToGroupMargin($scope.sendEmail.pricing).then(function(result) {
|
|
bfbbd8668
UI service
|
435 436 |
console.log("emails",$scope.sendEmail.pricing)
$scope.sendEmail = {};
|
|
9732e9b36
updates in fuel m...
|
437 438 439 440 |
toastr.success(''+result.success+'', {
closeButton: true
})
})
|
|
882908c84
fuel pricing modu...
|
441 442 443 444 445 446 |
}
$scope.cancelAndCloseConfirm = function(){
$scope.sendEmail = {};
$scope.sendEmail.pricing = '';
$('#confirm1').css('display', 'none');
}
|
|
32ea0c476
working on fuel m...
|
447 |
|
|
d121d5539
UI Changes
|
448 449 450 |
$(document).ready(function(){
$('.ui-datepicker-today a').addClass('ui-state-active');
})
|
|
32ea0c476
working on fuel m...
|
451 |
$scope.newFuelPricing = {};
|
|
4728ddfdd
schedule module f...
|
452 |
$scope.holdFuelPricing = {};
|
|
d121d5539
UI Changes
|
453 454 455 |
$scope.formFunction = function(){
updateFuelManagerService.getFuelPricingNew().then(function(result) {
|
|
325c8ff31
date issue fixed
|
456 |
$scope.newFuelPricing = result; |
|
d121d5539
UI Changes
|
457 |
// console.log('kd testing', result);
|
|
325c8ff31
date issue fixed
|
458 |
for (var i = 0; i<$scope.newFuelPricing.length; i++) {
|
|
a9e3a7365
fix issues on vie...
|
459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 |
if ($scope.newFuelPricing[i].fuelPricing != null) {
if ($scope.newFuelPricing[i].fuelPricing.expirationDate != null && $scope.newFuelPricing[i].fuelPricing.expirationDate != '') {
var newTime = new Date($scope.newFuelPricing[i].fuelPricing.expirationDate);
var month = newTime.getUTCMonth() + 1; //months from 1-12
var day = newTime.getUTCDate();
var year = newTime.getUTCFullYear();
$scope.newFuelPricing[i].fuelPricing.expirationDate = month+'/'+day+'/'+year;
}
}
if ($scope.newFuelPricing[i].futureFuelPricing != null) {
if ($scope.newFuelPricing[i].futureFuelPricing != null) {
if ($scope.newFuelPricing[i].futureFuelPricing.nextExpiration != null && $scope.newFuelPricing[i].futureFuelPricing.nextExpiration != '') {
var newTime = new Date($scope.newFuelPricing[i].futureFuelPricing.nextExpiration);
var nextMonth = newTime.getUTCMonth() + 1; //months from 1-12
var nextDay = newTime.getUTCDate();
var nextYear = newTime.getUTCFullYear();
$scope.newFuelPricing[i].futureFuelPricing.nextExpiration = nextMonth+'/'+nextDay+'/'+nextYear;
}
}
if ($scope.newFuelPricing[i].futureFuelPricing != null) {
if ($scope.newFuelPricing[i].futureFuelPricing.deployDate != null && $scope.newFuelPricing[i].futureFuelPricing.deployDate != '') {
var newTime = new Date($scope.newFuelPricing[i].futureFuelPricing.deployDate);
var dmonth = newTime.getUTCMonth() + 1; //months from 1-12
var dday = newTime.getUTCDate();
var dyear = newTime.getUTCFullYear();
$scope.newFuelPricing[i].futureFuelPricing.deployDate = dmonth+'/'+dday+'/'+dyear;
}
}
|
|
4728ddfdd
schedule module f...
|
487 |
} |
|
71c760e0c
update Fuel Manag...
|
488 489 |
var str =""+ $scope.newFuelPricing[i].name
|
|
4728ddfdd
schedule module f...
|
490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 |
if(str.startsWith("J")){
$scope.newFuelPricing[i].jeta = true;
var str1 = str.substring(0,5)
var str2 = str.substring(6, str.length)
$scope.newFuelPricing[i].name = str1
$scope.newFuelPricing[i].namejetrest = str2
}else if(str.startsWith("100")){
$scope.newFuelPricing[i].avgas = true;
var str1 = str.substring(0,5)
var str2 = str.substring(6, str.length)
$scope.newFuelPricing[i].name = str1
$scope.newFuelPricing[i].nameavgasrest = str2
}
}
|
|
1b71872b2
email and code be...
|
506 507 508 |
for (var i = 0; i
<result.length; i++) {
|
|
4728ddfdd
schedule module f...
|
509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 |
if (result[i].fuelPricing != null) {
if (result[i].fuelPricing.expirationDate != null && result[i].fuelPricing.expirationDate != '') {
var newTime = new Date(result[i].fuelPricing.expirationDate);
var month = newTime.getUTCMonth() + 1; //months from 1-12
var day = newTime.getUTCDate();
var year = newTime.getUTCFullYear();
result[i].fuelPricing.expirationDate = month+'/'+day+'/'+year;
}
}
if (result[i].futureFuelPricing != null) {
if (result[i].futureFuelPricing != null) {
if (result[i].futureFuelPricing.nextExpiration != null && result[i].futureFuelPricing.nextExpiration != '') {
var newTime = new Date($scope.newFuelPricing[i].futureFuelPricing.nextExpiration);
var nextMonth = newTime.getUTCMonth() + 1; //months from 1-12
var nextDay = newTime.getUTCDate();
var nextYear = newTime.getUTCFullYear();
result[i].futureFuelPricing.nextExpiration = nextMonth+'/'+nextDay+'/'+nextYear;
}
}
if (result[i].futureFuelPricing != null) {
if (result[i].futureFuelPricing.deployDate != null && result[i].futureFuelPricing.deployDate != '') {
var newTime = new Date(result[i].futureFuelPricing.deployDate);
var dmonth = newTime.getUTCMonth() + 1; //months from 1-12
var dday = newTime.getUTCDate();
var dyear = newTime.getUTCFullYear();
result[i].futureFuelPricing.deployDate = dmonth+'/'+dday+'/'+dyear;
}
}
}
}
$scope.holdFuelPricing = result;
$scope.showLoader = false;
|
|
71c760e0c
update Fuel Manag...
|
542 |
|
|
882908c84
fuel pricing modu...
|
543 |
}) |
|
d121d5539
UI Changes
|
544 545 546 |
};
$scope.formFunction();
|
|
325c8ff31
date issue fixed
|
547 548 |
$scope.$watch("fuelPricing.fuelPricing.expirationDate",function(old,newv){
});
|
|
882908c84
fuel pricing modu...
|
549 550 |
$scope.updateFuelPricing = {};
$scope.updateFuelPricing.fuelPricingList = [];
|
|
882908c84
fuel pricing modu...
|
551 552 |
$scope.updateFuelPricing.userProfileId = $scope.userProfileId;
$scope.updateFuelPricingClick = function(){
|
|
32ea0c476
working on fuel m...
|
553 |
$scope.showLoader = true; |
|
325c8ff31
date issue fixed
|
554 |
|
|
32ea0c476
working on fuel m...
|
555 |
for (var i = 0; i<$scope.newFuelPricing.length; i++) {
|
|
32ea0c476
working on fuel m...
|
556 557 558 559 560 561 562 563 564 565 566 567 568 |
if ($scope.newFuelPricing[i].fuelPricing != null) {
$scope.newFuelPricing[i].fuelPricing.papTotal = parseFloat($scope.newFuelPricing[i].fuelPricing.cost) + parseFloat($scope.newFuelPricing[i].fuelPricing.papMargin);
if ($scope.newFuelPricing[i].fuelPricing.cost == null) {
$scope.newFuelPricing[i].fuelPricing.cost = '';
}
if ($scope.newFuelPricing[i].fuelPricing.papMargin == null) {
$scope.newFuelPricing[i].fuelPricing.papMargin = '';
}
if ($scope.newFuelPricing[i].fuelPricing.papTotal == null) {
$scope.newFuelPricing[i].fuelPricing.papTotal = '';
}
if ($scope.newFuelPricing[i].fuelPricing.expirationDate == null) {
$scope.newFuelPricing[i].fuelPricing.expirationDate = '';
|
|
325c8ff31
date issue fixed
|
569 570 |
}else{
$scope.newFuelPricing[i].fuelPricing.expirationDate = new Date($scope.newFuelPricing[i].fuelPricing.expirationDate);
|
|
d121d5539
UI Changes
|
571 |
// console.log('$scope.newFuelPricing[i].fuelPricing.expirationDate', $scope.newFuelPricing[i].fuelPricing.expirationDate);
|
|
325c8ff31
date issue fixed
|
572 |
$scope.newFuelPricing[i].fuelPricing.expirationDate = $scope.newFuelPricing[i].fuelPricing.expirationDate.getTime(); |
|
32ea0c476
working on fuel m...
|
573 |
} |
|
d8cc21c7a
fixed fuel vendor...
|
574 575 576 577 578 579 580 581 582 583 |
$scope.newFuelPricing[i].fuelPricing.papTotal = parseFloat($scope.newFuelPricing[i].fuelPricing.cost) + parseFloat($scope.newFuelPricing[i].fuelPricing.papMargin);
$scope.updateFuelPricing.fuelPricingList.push({
'cost': $scope.newFuelPricing[i].fuelPricing.cost,
'papMargin': $scope.newFuelPricing[i].fuelPricing.papMargin,
'papTotal': $scope.newFuelPricing[i].fuelPricing.papTotal,
'expirationDate': $scope.newFuelPricing[i].fuelPricing.expirationDate,
'productId': $scope.newFuelPricing[i].id,
'id': $scope.newFuelPricing[i].fuelPricing.id,
})
|
|
325c8ff31
date issue fixed
|
584 585 |
}else{
|
|
d8cc21c7a
fixed fuel vendor...
|
586 |
/*$scope.newFuelPricing[i].fuelPricing.cost = ''; |
|
325c8ff31
date issue fixed
|
587 588 |
$scope.newFuelPricing[i].fuelPricing.papMargin = '';
$scope.newFuelPricing[i].fuelPricing.papTotal = '';
|
|
d8cc21c7a
fixed fuel vendor...
|
589 |
$scope.newFuelPricing[i].fuelPricing.expirationDate = '';*/ |
|
882908c84
fuel pricing modu...
|
590 |
} |
|
325c8ff31
date issue fixed
|
591 |
|
|
882908c84
fuel pricing modu...
|
592 |
} |
|
882908c84
fuel pricing modu...
|
593 594 |
updateFuelManagerService.updateFuelPricing($scope.updateFuelPricing).then(function(result) {
toastr.success('Successfully Updated', {
|
|
1097c2ce1
margin module add...
|
595 596 |
closeButton: true
})
|
|
32ea0c476
working on fuel m...
|
597 |
updateFuelManagerService.getFuelPricingNew().then(function(result) {
|
|
325c8ff31
date issue fixed
|
598 599 |
$scope.newFuelPricing = result;
for (var i = 0; i<$scope.newFuelPricing.length; i++) {
|
|
a9e3a7365
fix issues on vie...
|
600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 |
if ($scope.newFuelPricing[i].fuelPricing != null) {
if ($scope.newFuelPricing[i].fuelPricing.expirationDate != null && $scope.newFuelPricing[i].fuelPricing.expirationDate != '') {
var newTime = new Date($scope.newFuelPricing[i].fuelPricing.expirationDate);
var month = newTime.getUTCMonth() + 1; //months from 1-12
var day = newTime.getUTCDate();
var year = newTime.getUTCFullYear();
$scope.newFuelPricing[i].fuelPricing.expirationDate = month+'/'+day+'/'+year;
}
}
if ($scope.newFuelPricing[i].futureFuelPricing != null) {
if ($scope.newFuelPricing[i].futureFuelPricing != null) {
if ($scope.newFuelPricing[i].futureFuelPricing.nextExpiration != null && $scope.newFuelPricing[i].futureFuelPricing.nextExpiration != '') {
var newTime = new Date($scope.newFuelPricing[i].futureFuelPricing.nextExpiration);
var nextMonth = newTime.getUTCMonth() + 1; //months from 1-12
var nextDay = newTime.getUTCDate();
var nextYear = newTime.getUTCFullYear();
$scope.newFuelPricing[i].futureFuelPricing.nextExpiration = nextMonth+'/'+nextDay+'/'+nextYear;
}
}
if ($scope.newFuelPricing[i].futureFuelPricing != null) {
if ($scope.newFuelPricing[i].futureFuelPricing.deployDate != null && $scope.newFuelPricing[i].futureFuelPricing.deployDate != '') {
var newTime = new Date($scope.newFuelPricing[i].futureFuelPricing.deployDate);
var dmonth = newTime.getUTCMonth() + 1; //months from 1-12
var dday = newTime.getUTCDate();
var dyear = newTime.getUTCFullYear();
$scope.newFuelPricing[i].futureFuelPricing.deployDate = dmonth+'/'+dday+'/'+dyear;
}
}
|
|
325c8ff31
date issue fixed
|
628 |
} |
|
325c8ff31
date issue fixed
|
629 |
} |
|
4728ddfdd
schedule module f...
|
630 |
|
|
325c8ff31
date issue fixed
|
631 |
$scope.showLoader = false; |
|
1097c2ce1
margin module add...
|
632 |
}) |
|
e8983332d
margin accordian ...
|
633 |
}) |
|
882908c84
fuel pricing modu...
|
634 635 |
}
|
|
e8983332d
margin accordian ...
|
636 |
|
|
32ea0c476
working on fuel m...
|
637 |
$scope.updateFutureFuelPricing = {};
|
|
a9e3a7365
fix issues on vie...
|
638 |
$scope.updateFutureFuelPricing.futureFuelPricingList = []; |
|
32ea0c476
working on fuel m...
|
639 640 641 642 |
$scope.updateFutureFuelPricing.userProfileId = $scope.userProfileId;
$scope.updateFutureFuelPricingClick = function(){
$scope.showLoader = true;
for (var i = 0; i<$scope.newFuelPricing.length; i++) {
|
|
d8cc21c7a
fixed fuel vendor...
|
643 |
//console.log(parseFloat($scope.newFuelPricing[i].futureFuelPricing.cost) + parseFloat($scope.newFuelPricing[i].fuelPricing.papMargin)); |
|
d121d5539
UI Changes
|
644 |
// console.log('-----',$scope.newFuelPricing[i].futureFuelPricing);
|
|
32ea0c476
working on fuel m...
|
645 |
if ($scope.newFuelPricing[i].futureFuelPricing != null) {
|
|
d8cc21c7a
fixed fuel vendor...
|
646 |
if ($scope.newFuelPricing[i].futureFuelPricing.cost != null || $scope.newFuelPricing[i].futureFuelPricing.cost != '' || $scope.newFuelPricing[i].futureFuelPricing.cost != undefined) {
|
2f2d8a9ef
updates in update...
|
647 |
$scope.newFuelPricing[i].futureFuelPricing.papTotal = parseFloat($scope.newFuelPricing[i].futureFuelPricing.cost) + parseFloat($scope.newFuelPricing[i].futureFuelPricing.papMargin); |
|
d8cc21c7a
fixed fuel vendor...
|
648 649 650 651 652 653 654 655 656 657 658 659 660 |
if ($scope.newFuelPricing[i].futureFuelPricing.cost == null) {
$scope.newFuelPricing[i].futureFuelPricing.cost = '';
}
if ($scope.newFuelPricing[i].futureFuelPricing.papMargin == null) {
$scope.newFuelPricing[i].futureFuelPricing.papMargin = '';
}
if ($scope.newFuelPricing[i].futureFuelPricing.papTotal == null) {
$scope.newFuelPricing[i].futureFuelPricing.papTotal = '';
}
if ($scope.newFuelPricing[i].futureFuelPricing.nextExpiration == null) {
$scope.newFuelPricing[i].futureFuelPricing.nextExpiration = '';
}else{
$scope.newFuelPricing[i].futureFuelPricing.nextExpiration = new Date($scope.newFuelPricing[i].futureFuelPricing.nextExpiration);
|
|
d121d5539
UI Changes
|
661 |
// console.log('$scope.newFuelPricing[i].futureFuelPricing.nextExpiration', $scope.newFuelPricing[i].futureFuelPricing.nextExpiration);
|
|
d8cc21c7a
fixed fuel vendor...
|
662 663 664 665 666 667 668 669 |
$scope.newFuelPricing[i].futureFuelPricing.nextExpiration = $scope.newFuelPricing[i].futureFuelPricing.nextExpiration.getTime();
}
if ($scope.newFuelPricing[i].futureFuelPricing.deployDate == null) {
$scope.newFuelPricing[i].futureFuelPricing.deployDate = '';
}else{
$scope.newFuelPricing[i].futureFuelPricing.deployDate = new Date($scope.newFuelPricing[i].futureFuelPricing.deployDate);
$scope.newFuelPricing[i].futureFuelPricing.deployDate = $scope.newFuelPricing[i].futureFuelPricing.deployDate.getTime();
}
|
|
03cf7c388
minor changes due...
|
670 671 |
$scope.newFuelPricing[i].futureFuelPricing.papTotal = parseFloat($scope.newFuelPricing[i].futureFuelPricing.cost) + parseFloat($scope.newFuelPricing[i].futureFuelPricing.papMargin);
//$scope.newFuelPricing[i].futureFuelPricing.papTotal;
|
|
d8cc21c7a
fixed fuel vendor...
|
672 673 |
$scope.updateFutureFuelPricing.futureFuelPricingList.push({
'cost': $scope.newFuelPricing[i].futureFuelPricing.cost,
|
|
03cf7c388
minor changes due...
|
674 |
'papMargin': $scope.newFuelPricing[i].futureFuelPricing.papMargin, |
|
d8cc21c7a
fixed fuel vendor...
|
675 676 677 678 679 680 681 |
//'papTotal': $scope.newFuelPricing[i].futureFuelPricing.papTotal,
'papTotal': $scope.newFuelPricing[i].futureFuelPricing.papTotal,
'expirationDate': $scope.newFuelPricing[i].futureFuelPricing.nextExpiration,
'deployDate': $scope.newFuelPricing[i].futureFuelPricing.deployDate,
'productId': $scope.newFuelPricing[i].id,
'id': $scope.newFuelPricing[i].futureFuelPricing.id,
})
|
|
a9e3a7365
fix issues on vie...
|
682 |
} |
|
a9e3a7365
fix issues on vie...
|
683 684 685 686 687 688 |
}else{
/*$scope.newFuelPricing[i].futureFuelPricing.cost = '';
$scope.newFuelPricing[i].futureFuelPricing.papMargin = '';
$scope.newFuelPricing[i].futureFuelPricing.papTotal = '';
$scope.newFuelPricing[i].futureFuelPricing.expirationDate = '';
$scope.newFuelPricing[i].futureFuelPricing.deployDate = '';*/
|
|
32ea0c476
working on fuel m...
|
689 |
} |
|
8707ba5fd
fuel manager done
|
690 |
} |
|
03cf7c388
minor changes due...
|
691 |
//console.log('$scope.updateFutureFuelPricing', $scope.updateFutureFuelPricing);
|
|
a9e3a7365
fix issues on vie...
|
692 |
updateFuelManagerService.updateFutureFuelPricing($scope.updateFutureFuelPricing).then(function(result) {
|
|
32ea0c476
working on fuel m...
|
693 694 695 696 |
toastr.success('Successfully Updated', {
closeButton: true
})
updateFuelManagerService.getFuelPricingNew().then(function(result) {
|
|
a9e3a7365
fix issues on vie...
|
697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 |
$scope.newFuelPricing = result;
for (var i = 0; i<$scope.newFuelPricing.length; i++) {
if ($scope.newFuelPricing[i].fuelPricing != null) {
if ($scope.newFuelPricing[i].fuelPricing.expirationDate != null && $scope.newFuelPricing[i].fuelPricing.expirationDate != '') {
var newTime = new Date($scope.newFuelPricing[i].fuelPricing.expirationDate);
var month = newTime.getUTCMonth() + 1; //months from 1-12
var day = newTime.getUTCDate();
var year = newTime.getUTCFullYear();
$scope.newFuelPricing[i].fuelPricing.expirationDate = month+'/'+day+'/'+year;
}
}
if ($scope.newFuelPricing[i].futureFuelPricing != null) {
if ($scope.newFuelPricing[i].futureFuelPricing != null) {
if ($scope.newFuelPricing[i].futureFuelPricing.nextExpiration != null && $scope.newFuelPricing[i].futureFuelPricing.nextExpiration != '') {
var newTime = new Date($scope.newFuelPricing[i].futureFuelPricing.nextExpiration);
var nextMonth = newTime.getUTCMonth() + 1; //months from 1-12
var nextDay = newTime.getUTCDate();
var nextYear = newTime.getUTCFullYear();
$scope.newFuelPricing[i].futureFuelPricing.nextExpiration = nextMonth+'/'+nextDay+'/'+nextYear;
}
}
if ($scope.newFuelPricing[i].futureFuelPricing != null) {
if ($scope.newFuelPricing[i].futureFuelPricing.deployDate != null && $scope.newFuelPricing[i].futureFuelPricing.deployDate != '') {
var newTime = new Date($scope.newFuelPricing[i].futureFuelPricing.deployDate);
var dmonth = newTime.getUTCMonth() + 1; //months from 1-12
var dday = newTime.getUTCDate();
var dyear = newTime.getUTCFullYear();
$scope.newFuelPricing[i].futureFuelPricing.deployDate = dmonth+'/'+dday+'/'+dyear;
}
}
}
|
|
4728ddfdd
schedule module f...
|
728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 |
var str =""+ $scope.newFuelPricing[i].name
if(str.startsWith("J")){
$scope.newFuelPricing[i].jeta = true;
var str1 = str.substring(0,5)
var str2 = str.substring(6, str.length)
$scope.newFuelPricing[i].name = str1
$scope.newFuelPricing[i].namejetrest = str2
}else if(str.startsWith("100")){
$scope.newFuelPricing[i].avgas = true;
var str1 = str.substring(0,5)
var str2 = str.substring(6, str.length)
$scope.newFuelPricing[i].name = str1
$scope.newFuelPricing[i].nameavgasrest = str2
}
|
|
a9e3a7365
fix issues on vie...
|
746 747 |
}
$scope.showLoader = false;
|
|
32ea0c476
working on fuel m...
|
748 749 |
})
})
|
|
325c8ff31
date issue fixed
|
750 |
|
|
32ea0c476
working on fuel m...
|
751 752 |
}
|
|
feacde5ff
setup acuefuel in...
|
753 |
|
|
4728ddfdd
schedule module f...
|
754 755 |
$scope.updateFutureFuelPricingImmediatelyClick = function(){
$scope.showLoader = true;
|
|
d121d5539
UI Changes
|
756 |
// console.log('--$scope.newFuelPricing--', $scope.newFuelPricing);
|
|
4728ddfdd
schedule module f...
|
757 758 759 760 |
for (var i = 0; i<$scope.newFuelPricing.length; i++) {
//console.log(parseFloat($scope.newFuelPricing[i].futureFuelPricing.cost) + parseFloat($scope.newFuelPricing[i].fuelPricing.papMargin));
if ($scope.newFuelPricing[i].futureFuelPricing != null) {
if ($scope.newFuelPricing[i].futureFuelPricing.cost != null || $scope.newFuelPricing[i].futureFuelPricing.cost != '' || $scope.newFuelPricing[i].futureFuelPricing.cost != undefined) {
|
a9aef0b1c
new changes imple...
|
761 |
$scope.newFuelPricing[i].futureFuelPricing.papTotal = parseFloat($scope.newFuelPricing[i].futureFuelPricing.cost) + parseFloat($scope.newFuelPricing[i].futureFuelPricing.papMargin); |
|
4728ddfdd
schedule module f...
|
762 763 764 765 766 767 768 769 770 771 772 773 774 |
if ($scope.newFuelPricing[i].futureFuelPricing.cost == null) {
$scope.newFuelPricing[i].futureFuelPricing.cost = '';
}
if ($scope.newFuelPricing[i].futureFuelPricing.papMargin == null) {
$scope.newFuelPricing[i].futureFuelPricing.papMargin = '';
}
if ($scope.newFuelPricing[i].futureFuelPricing.papTotal == null) {
$scope.newFuelPricing[i].futureFuelPricing.papTotal = '';
}
if ($scope.newFuelPricing[i].futureFuelPricing.nextExpiration == null) {
$scope.newFuelPricing[i].futureFuelPricing.nextExpiration = '';
}else{
$scope.newFuelPricing[i].futureFuelPricing.nextExpiration = new Date($scope.newFuelPricing[i].futureFuelPricing.nextExpiration);
|
|
d121d5539
UI Changes
|
775 |
//console.log('$scope.newFuelPricing[i].futureFuelPricing.nextExpiration', $scope.newFuelPricing[i].futureFuelPricing.nextExpiration);
|
|
4728ddfdd
schedule module f...
|
776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 |
$scope.newFuelPricing[i].futureFuelPricing.nextExpiration = $scope.newFuelPricing[i].futureFuelPricing.nextExpiration.getTime();
}
if ($scope.newFuelPricing[i].futureFuelPricing.deployDate == null) {
$scope.newFuelPricing[i].futureFuelPricing.deployDate = '';
}else{
$scope.newFuelPricing[i].futureFuelPricing.deployDate = new Date($scope.newFuelPricing[i].futureFuelPricing.deployDate);
$scope.newFuelPricing[i].futureFuelPricing.deployDate = $scope.newFuelPricing[i].futureFuelPricing.deployDate.getTime();
}
$scope.newFuelPricing[i].futureFuelPricing.papTotal = parseFloat($scope.newFuelPricing[i].futureFuelPricing.cost) + parseFloat($scope.newFuelPricing[i].futureFuelPricing.papMargin);
//$scope.newFuelPricing[i].futureFuelPricing.papTotal;
$scope.updateFutureFuelPricing.futureFuelPricingList.push({
'cost': $scope.newFuelPricing[i].futureFuelPricing.cost,
'papMargin': $scope.newFuelPricing[i].futureFuelPricing.papMargin,
//'papTotal': $scope.newFuelPricing[i].futureFuelPricing.papTotal,
'papTotal': $scope.newFuelPricing[i].futureFuelPricing.papTotal,
'expirationDate': $scope.newFuelPricing[i].futureFuelPricing.nextExpiration,
'deployDate': $scope.newFuelPricing[i].futureFuelPricing.deployDate,
'productId': $scope.newFuelPricing[i].id,
'id': $scope.newFuelPricing[i].futureFuelPricing.id,
})
}
}else{
/*$scope.newFuelPricing[i].futureFuelPricing.cost = '';
$scope.newFuelPricing[i].futureFuelPricing.papMargin = '';
$scope.newFuelPricing[i].futureFuelPricing.papTotal = '';
$scope.newFuelPricing[i].futureFuelPricing.expirationDate = '';
$scope.newFuelPricing[i].futureFuelPricing.deployDate = '';*/
}
}
//console.log('$scope.updateFutureFuelPricing', $scope.updateFutureFuelPricing);
updateFuelManagerService.updateFutureFuelPricingImmediatlly($scope.updateFutureFuelPricing).then(function(result) {
toastr.success('Successfully Updated', {
closeButton: true
})
updateFuelManagerService.getFuelPricingNew().then(function(result) {
$scope.newFuelPricing = result;
for (var i = 0; i<$scope.newFuelPricing.length; i++) {
if ($scope.newFuelPricing[i].fuelPricing != null) {
if ($scope.newFuelPricing[i].fuelPricing.expirationDate != null && $scope.newFuelPricing[i].fuelPricing.expirationDate != '') {
var newTime = new Date($scope.newFuelPricing[i].fuelPricing.expirationDate);
var month = newTime.getUTCMonth() + 1; //months from 1-12
var day = newTime.getUTCDate();
var year = newTime.getUTCFullYear();
$scope.newFuelPricing[i].fuelPricing.expirationDate = month+'/'+day+'/'+year;
}
}
if ($scope.newFuelPricing[i].futureFuelPricing != null) {
if ($scope.newFuelPricing[i].futureFuelPricing != null) {
if ($scope.newFuelPricing[i].futureFuelPricing.nextExpiration != null && $scope.newFuelPricing[i].futureFuelPricing.nextExpiration != '') {
var newTime = new Date($scope.newFuelPricing[i].futureFuelPricing.nextExpiration);
var nextMonth = newTime.getUTCMonth() + 1; //months from 1-12
var nextDay = newTime.getUTCDate();
var nextYear = newTime.getUTCFullYear();
$scope.newFuelPricing[i].futureFuelPricing.nextExpiration = nextMonth+'/'+nextDay+'/'+nextYear;
}
}
if ($scope.newFuelPricing[i].futureFuelPricing != null) {
if ($scope.newFuelPricing[i].futureFuelPricing.deployDate != null && $scope.newFuelPricing[i].futureFuelPricing.deployDate != '') {
var newTime = new Date($scope.newFuelPricing[i].futureFuelPricing.deployDate);
var dmonth = newTime.getUTCMonth() + 1; //months from 1-12
var dday = newTime.getUTCDate();
var dyear = newTime.getUTCFullYear();
$scope.newFuelPricing[i].futureFuelPricing.deployDate = dmonth+'/'+dday+'/'+dyear;
}
}
}
var str =""+ $scope.newFuelPricing[i].name
if(str.startsWith("J")){
$scope.newFuelPricing[i].jeta = true;
var str1 = str.substring(0,5)
var str2 = str.substring(6, str.length)
$scope.newFuelPricing[i].name = str1
$scope.newFuelPricing[i].namejetrest = str2
}else if(str.startsWith("100")){
$scope.newFuelPricing[i].avgas = true;
var str1 = str.substring(0,5)
var str2 = str.substring(6, str.length)
$scope.newFuelPricing[i].name = str1
$scope.newFuelPricing[i].nameavgasrest = str2
}
}
$scope.showLoader = false;
})
})
}
|
|
a9e3a7365
fix issues on vie...
|
866 867 868 |
updateFuelManagerService.getMargin().then(function(result) {
$scope.marginList = result;
})
|
|
9732e9b36
updates in fuel m...
|
869 870 871 872 873 874 875 876 877 878 |
$scope.marginIdDelete = '';
$scope.deleteJetAccordian = function(id){
$scope.marginIdDelete = id;
$('#deleteMargin').css('display', 'block');
}
$scope.confirmDeleteMargin = function(){
$('#deleteMargin').css('display', 'none');
$scope.showLoader = true;
updateFuelManagerService.deleteMargin($scope.marginIdDelete).then(function(result) {
|
|
a7c71ad58
price manager aut...
|
879 |
//console.log("--kd---",$scope.marginIdDelete)
|
|
9732e9b36
updates in fuel m...
|
880 881 882 |
toastr.success(''+result.success+'', {
closeButton: true
})
|
|
a7c71ad58
price manager aut...
|
883 |
/*updateFuelManagerService.getATypeJets($scope.userProfileId).then(function(result) {
|
|
9732e9b36
updates in fuel m...
|
884 885 |
$scope.aTypeJets = result;
$scope.showLoader = false;
|
|
a7c71ad58
price manager aut...
|
886 887 |
})*/
getAtypeFunction();
|
|
9732e9b36
updates in fuel m...
|
888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 |
})
}
$scope.cancelMarginDelete = function(){
$scope.marginIdDelete = '';
$('#deleteMargin').css('display', 'none');
}
$scope.marginVtypeIdDelete = '';
$scope.deleteVtypeJetAccordian = function(id){
$scope.marginVtypeIdDelete = id;
$('#deleteVtypeMargin').css('display', 'block');
}
$scope.confirmDeletVtypeMargin = function(){
$('#deleteVtypeMargin').css('display', 'none');
$scope.showLoader = true;
updateFuelManagerService.deleteMargin($scope.marginVtypeIdDelete).then(function(result) {
toastr.success(''+result.success+'', {
closeButton: true
})
|
|
a7c71ad58
price manager aut...
|
909 |
/*updateFuelManagerService.getVTypeJets($scope.userProfileId).then(function(result) {
|
|
9732e9b36
updates in fuel m...
|
910 911 |
$scope.vTypeJets = result;
$scope.showLoader = false;
|
|
a7c71ad58
price manager aut...
|
912 913 |
})*/
getVTypeFunction();
|
|
9732e9b36
updates in fuel m...
|
914 915 916 917 918 919 920 |
})
}
$scope.cancelVtypeMarginDelete = function(){
$scope.marginVtypeIdDelete = '';
$('#deleteVtypeMargin').css('display', 'none');
}
|
|
d121d5539
UI Changes
|
921 |
|
|
2f2d8a9ef
updates in update...
|
922 |
$scope.resetFutureFuelPricingClick = function(){
|
|
d121d5539
UI Changes
|
923 |
//$scope.newFuelPricing=''; |
|
2f2d8a9ef
updates in update...
|
924 925 926 927 928 |
$('#resetPricing').css('display', 'block');
}
$scope.confirmReset = function(){
$('#resetPricing').css('display', 'none');
|
|
d121d5539
UI Changes
|
929 930 931 932 933 |
$scope.formFunction();
//$scope.showLoader = true;
//document.getElementById("resetForm").reset();
// $scope.fuelPricing.futureFuelPricing.cost="";
/*updateFuelManagerService.resetPricing().then(function(result) {
|
|
2f2d8a9ef
updates in update...
|
934 935 936 937 |
toastr.success(''+result.success+'', {
closeButton: true
})
$scope.showLoader = false;
|
|
d121d5539
UI Changes
|
938 |
})*/ |
|
2f2d8a9ef
updates in update...
|
939 940 941 942 943 944 945 946 947 948 949 950 951 952 |
}
$scope.cancelReset = function(){
$('#resetPricing').css('display', 'none');
}
$scope.noPrices = true;
$scope.disableButtons = function(value){
if(value.length != 0){
$scope.noPrices = false;
}
else{
$scope.noPrices = true;
}
}
|
|
a7c71ad58
price manager aut...
|
953 954 955 956 957 958 959 |
/*validate number input type to 4 digit auto complete zero's*/
$scope.force4decimals= function(data) {
//console.log("check",data)
event.target.value = parseFloat(event.target.value).toFixed(4);
//console.log("after check",event.target.value)
}
|
|
71c760e0c
update Fuel Manag...
|
960 |
|
|
feacde5ff
setup acuefuel in...
|
961 |
}]); |