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