Blame view
app/partials/updateFuelManager/updateFuelManager.controller.js
52.6 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 198 199 |
$('#deleteTierConfirm').css('display', 'none');
$scope.deleteTierObject = {};
}
/*$scope.deleteVtypeTier = function(id, jetid, index){
|
|
32286a73a
tier issue resolved
|
200 201 202 203 204 205 206 207 |
$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...
|
208 209 |
})
})
|
|
a9e3a7365
fix issues on vie...
|
210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 |
}*/
$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...
|
236 237 |
$('#deleteVtypeTierConfirm').css('display', 'none');
$scope.deleteVtypeTierObject = {};
|
|
1097c2ce1
margin module add...
|
238 |
} |
|
e8983332d
margin accordian ...
|
239 |
|
|
1097c2ce1
margin module add...
|
240 |
$scope.saveJetAccordian = function(jets){
|
|
32286a73a
tier issue resolved
|
241 |
$scope.showLoader = true; |
|
1097c2ce1
margin module add...
|
242 243 |
$scope.jetsDetail = jets;
$scope.jetsDetail.userProfileId = $scope.userProfileId;
|
|
1097c2ce1
margin module add...
|
244 245 246 247 248 |
$('.'+$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...
|
249 |
$('#'+$scope.jetsDetail.id+' .btn-primary').css('display', 'inline-block');
|
|
1097c2ce1
margin module add...
|
250 |
|
|
9732e9b36
updates in fuel m...
|
251 |
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...
|
252 253 |
updateFuelManagerService.editAtypeJetMargin(editJetData).then(function(result) {
|
|
1097c2ce1
margin module add...
|
254 255 256 |
toastr.success('Successfully Updated', {
closeButton: true
})
|
|
26f8c698a
fixes
|
257 |
|
|
a7c71ad58
price manager aut...
|
258 |
getAtypeFunction(); |
|
e8983332d
margin accordian ...
|
259 |
}) |
|
e8983332d
margin accordian ...
|
260 |
|
|
1097c2ce1
margin module add...
|
261 |
} |
|
e95d89b77
integrate editor ...
|
262 263 264 265 266 267 |
$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...
|
268 |
$('#'+jets.id+' .btn-primary').css('display', 'inline-block');
|
|
e95d89b77
integrate editor ...
|
269 270 271 272 273 274 275 276 |
}
$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...
|
277 |
$('#'+jets.id+' .btn-primary').css('display', 'inline-block');
|
|
e95d89b77
integrate editor ...
|
278 |
} |
|
8707ba5fd
fuel manager done
|
279 |
$scope.saveVtypeJetAccordian = function(jets){
|
|
32286a73a
tier issue resolved
|
280 |
$scope.showLoader = true; |
|
8707ba5fd
fuel manager done
|
281 282 283 284 285 286 287 288 |
$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...
|
289 |
$('#'+jets.id+' .btn-primary').css('display', 'inline-block');
|
|
8707ba5fd
fuel manager done
|
290 |
|
|
9732e9b36
updates in fuel m...
|
291 |
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
|
292 293 |
updateFuelManagerService.editVtypeJetMargin(editVtypeJetData).then(function(result) {
|
|
8707ba5fd
fuel manager done
|
294 295 296 |
toastr.success('Successfully Updated', {
closeButton: true
})
|
|
26f8c698a
fixes
|
297 |
|
|
a7c71ad58
price manager aut...
|
298 |
getVTypeFunction(); |
|
8707ba5fd
fuel manager done
|
299 300 301 302 303 |
})
}
$scope.newJet = {};
|
|
1097c2ce1
margin module add...
|
304 305 306 307 308 |
$scope.addNewMarginBtn = function(){
$('.addNewMargin').css('display', 'block');
}
$scope.closeMarginPopup = function(){
$('.addNewMargin').css('display', 'none');
|
|
8707ba5fd
fuel manager done
|
309 |
$scope.newJet = {};
|
|
1097c2ce1
margin module add...
|
310 |
} |
|
8707ba5fd
fuel manager done
|
311 |
//$scope.newJet.productType = ''; |
|
1097c2ce1
margin module add...
|
312 313 |
$scope.addNewATypeJet = function(){
|
|
32286a73a
tier issue resolved
|
314 |
$scope.showLoader = true; |
|
1097c2ce1
margin module add...
|
315 316 |
$scope.newJet.productType = 'JET-A';
$scope.newJet.userProfileId = $scope.userProfileId;
|
|
9732e9b36
updates in fuel m...
|
317 |
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...
|
318 319 |
updateFuelManagerService.addNewAtypeJetMargin(jetData).then(function(result) {
|
|
1097c2ce1
margin module add...
|
320 321 322 323 |
toastr.success('Successfully Added', {
closeButton: true
})
$('.addNewMargin').css('display', 'none');
|
|
26f8c698a
fixes
|
324 |
|
|
a7c71ad58
price manager aut...
|
325 |
getAtypeFunction(); |
|
e8983332d
margin accordian ...
|
326 |
}) |
|
1097c2ce1
margin module add...
|
327 |
} |
|
e8983332d
margin accordian ...
|
328 |
|
|
8707ba5fd
fuel manager done
|
329 330 331 332 333 334 335 336 337 338 339 |
$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
|
340 |
$scope.showLoader = true; |
|
8707ba5fd
fuel manager done
|
341 342 |
$scope.newVtypeJet.productType = 'AVGAS';
$scope.newVtypeJet.userProfileId = $scope.userProfileId;
|
|
9732e9b36
updates in fuel m...
|
343 |
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
|
344 345 |
updateFuelManagerService.addNewVtypeJet(vJetData).then(function(result) {
|
|
b90971c06
scheduler and ram...
|
346 |
console.log("AVGAS data",vJetData)
|
|
8707ba5fd
fuel manager done
|
347 348 349 350 351 |
toastr.success('Successfully Added', {
closeButton: true
})
$('.addNewVtype').css('display', 'none');
|
|
26f8c698a
fixes
|
352 |
|
|
a7c71ad58
price manager aut...
|
353 |
getVTypeFunction(); |
|
8707ba5fd
fuel manager done
|
354 355 356 |
})
}
|
|
bfbbd8668
UI service
|
357 358 359 |
/*Jet A Margin Email Send */
$scope.emailForJetMargin;
$scope.emailPricingForJetAMargin = function(value){
|
|
ebcdbb65b
update Fuel Manag...
|
360 |
$('#confirm2').css('display', 'block');
|
|
bfbbd8668
UI service
|
361 |
$scope.emailForJetMargin = value; |
|
ebcdbb65b
update Fuel Manag...
|
362 363 364 365 |
}
$scope.saveAndCloseForMarginConfirm = function(){
$('#confirm2').css('display', 'none');
|
|
bfbbd8668
UI service
|
366 367 |
updateFuelManagerService.sendMailToJetAMargin($scope.emailForJetMargin).then(function(result) {
console.log("email margin jeta",$scope.emailForJetMargin)
|
cefbd3ffa
email related issues
|
368 369 370 371 372 373 374 375 376 |
if(result.error) {
toastr.error('' + result.error + '', {
closeButton: true
})
} else {
toastr.success(''+result.success+'', {
closeButton: true
})
}
|
|
ebcdbb65b
update Fuel Manag...
|
377 378 379 380 381 |
})
}
$scope.cancelAndCloseForMarginConfirm = function(){
$('#confirm2').css('display', 'none');
}
|
|
8707ba5fd
fuel manager done
|
382 |
|
|
bfbbd8668
UI service
|
383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 |
/*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...
|
403 |
$scope.sendEmail = {};
|
|
1097c2ce1
margin module add...
|
404 |
|
|
882908c84
fuel pricing modu...
|
405 |
$scope.confirmMail = function(){
|
|
9732e9b36
updates in fuel m...
|
406 |
if ($scope.sendEmail.pricing != '' && $scope.sendEmail.pricing != null && $scope.sendEmail.pricing != undefined) {
|
|
882908c84
fuel pricing modu...
|
407 |
$('#confirm1').css('display', 'block');
|
|
bfbbd8668
UI service
|
408 |
|
|
882908c84
fuel pricing modu...
|
409 410 |
}
}
|
|
9732e9b36
updates in fuel m...
|
411 |
|
|
882908c84
fuel pricing modu...
|
412 413 |
$scope.saveAndCloseConfirm = function(){
$('#confirm1').css('display', 'none');
|
|
ebcdbb65b
update Fuel Manag...
|
414 |
updateFuelManagerService.sendMailToGroupMargin($scope.sendEmail.pricing).then(function(result) {
|
|
bfbbd8668
UI service
|
415 |
$scope.sendEmail = {};
|
|
cefbd3ffa
email related issues
|
416 417 418 419 420 421 422 423 424 |
if(result.error) {
toastr.error('' + result.error + '', {
closeButton: true
})
} else {
toastr.success(''+result.success+'', {
closeButton: true
})
}
|
|
9732e9b36
updates in fuel m...
|
425 |
}) |
|
882908c84
fuel pricing modu...
|
426 427 428 429 430 431 |
}
$scope.cancelAndCloseConfirm = function(){
$scope.sendEmail = {};
$scope.sendEmail.pricing = '';
$('#confirm1').css('display', 'none');
}
|
|
32ea0c476
working on fuel m...
|
432 |
|
|
d121d5539
UI Changes
|
433 434 435 |
$(document).ready(function(){
$('.ui-datepicker-today a').addClass('ui-state-active');
})
|
|
32ea0c476
working on fuel m...
|
436 |
$scope.newFuelPricing = {};
|
|
4728ddfdd
schedule module f...
|
437 |
$scope.holdFuelPricing = {};
|
|
d121d5539
UI Changes
|
438 439 440 |
$scope.formFunction = function(){
updateFuelManagerService.getFuelPricingNew().then(function(result) {
|
|
26f8c698a
fixes
|
441 |
$scope.newFuelPricing = result; |
|
325c8ff31
date issue fixed
|
442 |
for (var i = 0; i<$scope.newFuelPricing.length; i++) {
|
|
a9e3a7365
fix issues on vie...
|
443 |
if ($scope.newFuelPricing[i].fuelPricing != null) {
|
|
26f8c698a
fixes
|
444 445 |
/*console.log('Swarn Singh', $scope.newFuelPricing[i].fuelPricing);
console.log('Swarn Singh', new Date($scope.newFuelPricing[i].fuelPricing.expirationDate));
|
|
a9e3a7365
fix issues on vie...
|
446 447 448 449 450 |
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
|
451 |
|
|
a9e3a7365
fix issues on vie...
|
452 |
$scope.newFuelPricing[i].fuelPricing.expirationDate = month+'/'+day+'/'+year; |
|
26f8c698a
fixes
|
453 |
}*/ |
|
a9e3a7365
fix issues on vie...
|
454 455 456 |
}
if ($scope.newFuelPricing[i].futureFuelPricing != null) {
if ($scope.newFuelPricing[i].futureFuelPricing != null) {
|
|
26f8c698a
fixes
|
457 |
/*if ($scope.newFuelPricing[i].futureFuelPricing.nextExpiration != null && $scope.newFuelPricing[i].futureFuelPricing.nextExpiration != '') {
|
|
a9e3a7365
fix issues on vie...
|
458 459 460 461 462 |
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
|
463 |
}*/ |
|
a9e3a7365
fix issues on vie...
|
464 465 |
}
if ($scope.newFuelPricing[i].futureFuelPricing != null) {
|
|
26f8c698a
fixes
|
466 |
/*if ($scope.newFuelPricing[i].futureFuelPricing.deployDate != null && $scope.newFuelPricing[i].futureFuelPricing.deployDate != '') {
|
|
a9e3a7365
fix issues on vie...
|
467 468 469 470 471 |
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
|
472 |
}*/ |
|
a9e3a7365
fix issues on vie...
|
473 |
} |
|
4728ddfdd
schedule module f...
|
474 |
} |
|
71c760e0c
update Fuel Manag...
|
475 476 |
var str =""+ $scope.newFuelPricing[i].name
|
|
4728ddfdd
schedule module f...
|
477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 |
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
|
493 |
for (var i = 0; i<result.length; i++) {
|
|
4728ddfdd
schedule module f...
|
494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 |
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...
|
527 |
|
|
882908c84
fuel pricing modu...
|
528 |
}) |
|
d121d5539
UI Changes
|
529 530 531 |
};
$scope.formFunction();
|
|
325c8ff31
date issue fixed
|
532 533 |
$scope.$watch("fuelPricing.fuelPricing.expirationDate",function(old,newv){
});
|
|
882908c84
fuel pricing modu...
|
534 535 |
$scope.updateFuelPricing = {};
$scope.updateFuelPricing.fuelPricingList = [];
|
|
882908c84
fuel pricing modu...
|
536 537 |
$scope.updateFuelPricing.userProfileId = $scope.userProfileId;
$scope.updateFuelPricingClick = function(){
|
|
32ea0c476
working on fuel m...
|
538 |
$scope.showLoader = true; |
|
325c8ff31
date issue fixed
|
539 |
|
|
32ea0c476
working on fuel m...
|
540 |
for (var i = 0; i<$scope.newFuelPricing.length; i++) {
|
|
32ea0c476
working on fuel m...
|
541 542 543 544 545 546 547 548 549 550 551 552 553 |
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
|
554 |
}else{
|
|
26f8c698a
fixes
|
555 556 557 558 559 560 561 562 |
//$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
|
563 |
$scope.newFuelPricing[i].fuelPricing.expirationDate = new Date($scope.newFuelPricing[i].fuelPricing.expirationDate); |
|
325c8ff31
date issue fixed
|
564 |
$scope.newFuelPricing[i].fuelPricing.expirationDate = $scope.newFuelPricing[i].fuelPricing.expirationDate.getTime(); |
|
32ea0c476
working on fuel m...
|
565 |
} |
|
d8cc21c7a
fixed fuel vendor...
|
566 567 568 569 570 571 572 573 574 575 |
$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
|
576 577 |
}else{
|
|
d8cc21c7a
fixed fuel vendor...
|
578 |
/*$scope.newFuelPricing[i].fuelPricing.cost = ''; |
|
325c8ff31
date issue fixed
|
579 580 |
$scope.newFuelPricing[i].fuelPricing.papMargin = '';
$scope.newFuelPricing[i].fuelPricing.papTotal = '';
|
|
d8cc21c7a
fixed fuel vendor...
|
581 |
$scope.newFuelPricing[i].fuelPricing.expirationDate = '';*/ |
|
882908c84
fuel pricing modu...
|
582 |
} |
|
325c8ff31
date issue fixed
|
583 |
|
|
882908c84
fuel pricing modu...
|
584 |
} |
|
882908c84
fuel pricing modu...
|
585 586 |
updateFuelManagerService.updateFuelPricing($scope.updateFuelPricing).then(function(result) {
toastr.success('Successfully Updated', {
|
|
1097c2ce1
margin module add...
|
587 588 |
closeButton: true
})
|
|
32ea0c476
working on fuel m...
|
589 |
updateFuelManagerService.getFuelPricingNew().then(function(result) {
|
|
325c8ff31
date issue fixed
|
590 591 |
$scope.newFuelPricing = result;
for (var i = 0; i<$scope.newFuelPricing.length; i++) {
|
|
a9e3a7365
fix issues on vie...
|
592 |
if ($scope.newFuelPricing[i].fuelPricing != null) {
|
|
26f8c698a
fixes
|
593 |
/*if ($scope.newFuelPricing[i].fuelPricing.expirationDate != null && $scope.newFuelPricing[i].fuelPricing.expirationDate != '') {
|
|
a9e3a7365
fix issues on vie...
|
594 595 596 597 598 |
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
|
599 |
}*/ |
|
a9e3a7365
fix issues on vie...
|
600 601 602 |
}
if ($scope.newFuelPricing[i].futureFuelPricing != null) {
if ($scope.newFuelPricing[i].futureFuelPricing != null) {
|
|
26f8c698a
fixes
|
603 |
/*if ($scope.newFuelPricing[i].futureFuelPricing.nextExpiration != null && $scope.newFuelPricing[i].futureFuelPricing.nextExpiration != '') {
|
|
a9e3a7365
fix issues on vie...
|
604 605 606 607 608 |
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
|
609 |
}*/ |
|
a9e3a7365
fix issues on vie...
|
610 611 |
}
if ($scope.newFuelPricing[i].futureFuelPricing != null) {
|
|
26f8c698a
fixes
|
612 |
/* if ($scope.newFuelPricing[i].futureFuelPricing.deployDate != null && $scope.newFuelPricing[i].futureFuelPricing.deployDate != '') {
|
|
a9e3a7365
fix issues on vie...
|
613 614 615 616 617 |
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
|
618 |
}*/ |
|
a9e3a7365
fix issues on vie...
|
619 |
} |
|
325c8ff31
date issue fixed
|
620 |
} |
|
325c8ff31
date issue fixed
|
621 |
} |
|
4728ddfdd
schedule module f...
|
622 |
|
|
325c8ff31
date issue fixed
|
623 |
$scope.showLoader = false; |
|
1097c2ce1
margin module add...
|
624 |
}) |
|
e8983332d
margin accordian ...
|
625 |
}) |
|
882908c84
fuel pricing modu...
|
626 627 |
}
|
|
e8983332d
margin accordian ...
|
628 |
|
|
26f8c698a
fixes
|
629 |
/*Use for Save and Stage for Deploy */ |
|
32ea0c476
working on fuel m...
|
630 |
$scope.updateFutureFuelPricing = {};
|
|
a9e3a7365
fix issues on vie...
|
631 |
$scope.updateFutureFuelPricing.futureFuelPricingList = []; |
|
32ea0c476
working on fuel m...
|
632 633 634 635 |
$scope.updateFutureFuelPricing.userProfileId = $scope.userProfileId;
$scope.updateFutureFuelPricingClick = function(){
$scope.showLoader = true;
for (var i = 0; i<$scope.newFuelPricing.length; i++) {
|
|
d8cc21c7a
fixed fuel vendor...
|
636 |
//console.log(parseFloat($scope.newFuelPricing[i].futureFuelPricing.cost) + parseFloat($scope.newFuelPricing[i].fuelPricing.papMargin)); |
|
d121d5539
UI Changes
|
637 |
// console.log('-----',$scope.newFuelPricing[i].futureFuelPricing);
|
|
32ea0c476
working on fuel m...
|
638 |
if ($scope.newFuelPricing[i].futureFuelPricing != null) {
|
|
d8cc21c7a
fixed fuel vendor...
|
639 |
if ($scope.newFuelPricing[i].futureFuelPricing.cost != null || $scope.newFuelPricing[i].futureFuelPricing.cost != '' || $scope.newFuelPricing[i].futureFuelPricing.cost != undefined) {
|
2f2d8a9ef
updates in update...
|
640 |
$scope.newFuelPricing[i].futureFuelPricing.papTotal = parseFloat($scope.newFuelPricing[i].futureFuelPricing.cost) + parseFloat($scope.newFuelPricing[i].futureFuelPricing.papMargin); |
|
d8cc21c7a
fixed fuel vendor...
|
641 642 643 644 645 646 647 648 649 650 651 652 |
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
|
653 654 655 656 657 658 |
//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...
|
659 |
$scope.newFuelPricing[i].futureFuelPricing.nextExpiration = new Date($scope.newFuelPricing[i].futureFuelPricing.nextExpiration); |
|
d8cc21c7a
fixed fuel vendor...
|
660 661 662 663 664 |
$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
|
665 666 667 668 669 |
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...
|
670 671 672 |
$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...
|
673 674 |
$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...
|
675 676 |
$scope.updateFutureFuelPricing.futureFuelPricingList.push({
'cost': $scope.newFuelPricing[i].futureFuelPricing.cost,
|
|
03cf7c388
minor changes due...
|
677 |
'papMargin': $scope.newFuelPricing[i].futureFuelPricing.papMargin, |
|
d8cc21c7a
fixed fuel vendor...
|
678 679 680 681 682 683 684 |
//'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...
|
685 |
} |
|
a9e3a7365
fix issues on vie...
|
686 687 688 689 690 691 |
}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...
|
692 |
} |
|
8707ba5fd
fuel manager done
|
693 |
} |
|
03cf7c388
minor changes due...
|
694 |
//console.log('$scope.updateFutureFuelPricing', $scope.updateFutureFuelPricing);
|
|
a9e3a7365
fix issues on vie...
|
695 |
updateFuelManagerService.updateFutureFuelPricing($scope.updateFutureFuelPricing).then(function(result) {
|
|
32ea0c476
working on fuel m...
|
696 697 698 699 |
toastr.success('Successfully Updated', {
closeButton: true
})
updateFuelManagerService.getFuelPricingNew().then(function(result) {
|
|
a9e3a7365
fix issues on vie...
|
700 701 702 |
$scope.newFuelPricing = result;
for (var i = 0; i<$scope.newFuelPricing.length; i++) {
if ($scope.newFuelPricing[i].fuelPricing != null) {
|
|
26f8c698a
fixes
|
703 |
/*if ($scope.newFuelPricing[i].fuelPricing.expirationDate != null && $scope.newFuelPricing[i].fuelPricing.expirationDate != '') {
|
|
a9e3a7365
fix issues on vie...
|
704 705 706 707 708 |
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
|
709 |
}*/ |
|
a9e3a7365
fix issues on vie...
|
710 711 712 |
}
if ($scope.newFuelPricing[i].futureFuelPricing != null) {
if ($scope.newFuelPricing[i].futureFuelPricing != null) {
|
|
26f8c698a
fixes
|
713 |
/*if ($scope.newFuelPricing[i].futureFuelPricing.nextExpiration != null && $scope.newFuelPricing[i].futureFuelPricing.nextExpiration != '') {
|
|
a9e3a7365
fix issues on vie...
|
714 715 716 717 718 |
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
|
719 |
}*/ |
|
a9e3a7365
fix issues on vie...
|
720 721 |
}
if ($scope.newFuelPricing[i].futureFuelPricing != null) {
|
|
26f8c698a
fixes
|
722 |
/*if ($scope.newFuelPricing[i].futureFuelPricing.deployDate != null && $scope.newFuelPricing[i].futureFuelPricing.deployDate != '') {
|
|
a9e3a7365
fix issues on vie...
|
723 724 725 726 727 |
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
|
728 |
}*/ |
|
a9e3a7365
fix issues on vie...
|
729 730 |
}
}
|
|
4728ddfdd
schedule module f...
|
731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 |
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...
|
749 |
} |
|
26f8c698a
fixes
|
750 |
$state.reload(); |
|
a9e3a7365
fix issues on vie...
|
751 |
$scope.showLoader = false; |
|
32ea0c476
working on fuel m...
|
752 753 |
})
})
|
|
325c8ff31
date issue fixed
|
754 |
|
|
32ea0c476
working on fuel m...
|
755 756 |
}
|
|
feacde5ff
setup acuefuel in...
|
757 |
|
|
26f8c698a
fixes
|
758 |
/* Use for Save & Deploy Immediately */ |
|
4728ddfdd
schedule module f...
|
759 760 |
$scope.updateFutureFuelPricingImmediatelyClick = function(){
$scope.showLoader = true;
|
|
d121d5539
UI Changes
|
761 |
// console.log('--$scope.newFuelPricing--', $scope.newFuelPricing);
|
|
4728ddfdd
schedule module f...
|
762 763 764 765 |
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...
|
766 |
$scope.newFuelPricing[i].futureFuelPricing.papTotal = parseFloat($scope.newFuelPricing[i].futureFuelPricing.cost) + parseFloat($scope.newFuelPricing[i].futureFuelPricing.papMargin); |
|
4728ddfdd
schedule module f...
|
767 768 769 770 771 772 773 774 775 776 777 778 |
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
|
779 780 781 782 783 |
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...
|
784 |
$scope.newFuelPricing[i].futureFuelPricing.nextExpiration = new Date($scope.newFuelPricing[i].futureFuelPricing.nextExpiration); |
|
4728ddfdd
schedule module f...
|
785 786 787 788 789 |
$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
|
790 791 792 793 794 |
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...
|
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 |
$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
|
829 830 |
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...
|
831 832 833 834 835 |
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
|
836 |
}*/ |
|
4728ddfdd
schedule module f...
|
837 838 839 |
}
if ($scope.newFuelPricing[i].futureFuelPricing != null) {
if ($scope.newFuelPricing[i].futureFuelPricing != null) {
|
|
26f8c698a
fixes
|
840 841 |
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...
|
842 843 844 845 846 |
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
|
847 |
}*/ |
|
4728ddfdd
schedule module f...
|
848 849 |
}
if ($scope.newFuelPricing[i].futureFuelPricing != null) {
|
|
26f8c698a
fixes
|
850 |
/*if ($scope.newFuelPricing[i].futureFuelPricing.deployDate != null && $scope.newFuelPricing[i].futureFuelPricing.deployDate != '') {
|
|
4728ddfdd
schedule module f...
|
851 852 853 854 855 |
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
|
856 857 |
}*/
console.log(" $scope.newFuelPricing[i].futureFuelPricing.deployDate", $scope.newFuelPricing[i].futureFuelPricing.deployDate)
|
|
4728ddfdd
schedule module f...
|
858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 |
}
}
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
|
881 |
$state.reload(); |
|
4728ddfdd
schedule module f...
|
882 883 |
})
}
|
|
a9e3a7365
fix issues on vie...
|
884 885 886 |
updateFuelManagerService.getMargin().then(function(result) {
$scope.marginList = result;
})
|
|
9732e9b36
updates in fuel m...
|
887 888 889 890 891 892 893 894 895 896 |
$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...
|
897 |
//console.log("--kd---",$scope.marginIdDelete)
|
|
9732e9b36
updates in fuel m...
|
898 899 900 |
toastr.success(''+result.success+'', {
closeButton: true
})
|
|
26f8c698a
fixes
|
901 |
|
|
a7c71ad58
price manager aut...
|
902 |
getAtypeFunction(); |
|
9732e9b36
updates in fuel m...
|
903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 |
})
}
$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
|
924 |
|
|
a7c71ad58
price manager aut...
|
925 |
getVTypeFunction(); |
|
9732e9b36
updates in fuel m...
|
926 927 928 929 930 931 932 |
})
}
$scope.cancelVtypeMarginDelete = function(){
$scope.marginVtypeIdDelete = '';
$('#deleteVtypeMargin').css('display', 'none');
}
|
|
d121d5539
UI Changes
|
933 |
|
|
2f2d8a9ef
updates in update...
|
934 |
$scope.resetFutureFuelPricingClick = function(){
|
|
d121d5539
UI Changes
|
935 |
//$scope.newFuelPricing=''; |
|
2f2d8a9ef
updates in update...
|
936 937 938 939 940 |
$('#resetPricing').css('display', 'block');
}
$scope.confirmReset = function(){
$('#resetPricing').css('display', 'none');
|
|
d121d5539
UI Changes
|
941 942 943 944 945 |
$scope.formFunction();
//$scope.showLoader = true;
//document.getElementById("resetForm").reset();
// $scope.fuelPricing.futureFuelPricing.cost="";
/*updateFuelManagerService.resetPricing().then(function(result) {
|
|
2f2d8a9ef
updates in update...
|
946 947 948 949 |
toastr.success(''+result.success+'', {
closeButton: true
})
$scope.showLoader = false;
|
|
d121d5539
UI Changes
|
950 |
})*/ |
|
2f2d8a9ef
updates in update...
|
951 952 953 954 955 956 957 958 959 960 961 962 963 964 |
}
$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...
|
965 966 967 968 969 970 971 |
/*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...
|
972 |
|
|
feacde5ff
setup acuefuel in...
|
973 |
}]); |