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