Commit 039002959d12be8fc8a9fe9280f6c23725172e7a
1 parent
bb09cc25d4
Exists in
master
minor change
Showing
1 changed file
with
13 additions
and
12 deletions
Show diff stats
app/partials/analytics/analytics.controller.js
| ... | ... | @@ -383,7 +383,7 @@ angular.module('acufuel') |
| 383 | 383 | $scope.getCS = function() { |
| 384 | 384 | //var makeId = makeId; |
| 385 | 385 | analyticsService.getCS().then(function(result) { |
| 386 | - console.log("===customersupports===",result) | |
| 386 | + //console.log("===customersupports===",result) | |
| 387 | 387 | $scope.csValues = result; |
| 388 | 388 | $scope.optionscs = { |
| 389 | 389 | chart: { |
| ... | ... | @@ -437,17 +437,17 @@ angular.module('acufuel') |
| 437 | 437 | if(result[i].includes("JET-A Full Service") ){ |
| 438 | 438 | let datePusha = result[i][0]; |
| 439 | 439 | let tempValue = result[i][1].toFixed(2); |
| 440 | - let valePusha = parseInt(tempValue); | |
| 440 | + let valePusha = parseFloat(tempValue); | |
| 441 | 441 | $scope.hfpValuesOne.values.push([datePusha, valePusha]) |
| 442 | 442 | }else if(result[i].includes("100LL Full Service") ) { |
| 443 | 443 | let datePushb = result[i][0]; |
| 444 | 444 | let tempvalePushb = result[i][1].toFixed(2); |
| 445 | - let valePushb = parseInt(tempvalePushb); | |
| 445 | + let valePushb = parseFloat(tempvalePushb); | |
| 446 | 446 | $scope.hfpValuesTwo.values.push([datePushb, valePushb]) |
| 447 | 447 | } |
| 448 | 448 | } |
| 449 | 449 | $scope.hfpFinalData.push($scope.hfpValuesOne, $scope.hfpValuesTwo); |
| 450 | - // console.log('$scope.hfpFinalData', $scope.hfpFinalData); | |
| 450 | + // console.log('$scope.hfpFinalData', $scope.hfpFinalData); | |
| 451 | 451 | |
| 452 | 452 | var chart = nv.models.lineChart() |
| 453 | 453 | .x(function(d) { return d[0] }) |
| ... | ... | @@ -499,7 +499,7 @@ angular.module('acufuel') |
| 499 | 499 | } else if ($scope.hfp.fromDate != undefined && $scope.hfp.toDate === undefined || $scope.hfp.toDate === '') { |
| 500 | 500 | $scope.fillForm = false; |
| 501 | 501 | var today = new Date(); |
| 502 | - var DefaultToDate = today.getFullYear() + '-' + ("0" + (today.getMonth() + 1)).slice(-2) + '-' + ("0" + today.getDate()).slice(-2); | |
| 502 | + var DefaultToDate = today.getFullYear() + '-' + ("0" + (today.getMonth() + 1)).slice(-2) + '-' + ("0" + today.getDate()).slice(-2) + " " + '23:59:59'; | |
| 503 | 503 | //from date format |
| 504 | 504 | $scope.dat1 = $scope.hfp.fromDate; |
| 505 | 505 | $scope.fd1 = $scope.dat1.split("/").reverse(); |
| ... | ... | @@ -507,23 +507,24 @@ angular.module('acufuel') |
| 507 | 507 | $scope.fd1[2] = $scope.fd1[1]; |
| 508 | 508 | $scope.fd1[1] = $scope.tmp; |
| 509 | 509 | $scope.fd = $scope.fd1.join("-"); |
| 510 | + // console.log("===date====",$scope.fd,"===dad====",DefaultToDate) | |
| 510 | 511 | analyticsService.getDRFHfpChart($scope.fd, DefaultToDate).then(function(result) { |
| 511 | 512 | // console.log("===date range===",$scope.fd,DefaultToDate) |
| 512 | 513 | for(var i=0; i<result.length; i++) { |
| 513 | 514 | if(result[i].includes("JET-A Full Service") ){ |
| 514 | 515 | let datePusha = result[i][0]; |
| 515 | 516 | let tempValue = result[i][1].toFixed(2); |
| 516 | - let valePusha = parseInt(tempValue); | |
| 517 | + let valePusha = parseFloat(tempValue); | |
| 517 | 518 | $scope.hfpValuesFirst.values.push([datePusha, valePusha]) |
| 518 | 519 | }else if(result[i].includes("100LL Full Service") ) { |
| 519 | 520 | let datePushb = result[i][0]; |
| 520 | 521 | let tempvalePushb = result[i][1].toFixed(2); |
| 521 | - let valePushb = parseInt(tempvalePushb); | |
| 522 | + let valePushb = parseFloat(tempvalePushb); | |
| 522 | 523 | $scope.hfpValuesSecond.values.push([datePushb, valePushb]) |
| 523 | 524 | } |
| 524 | 525 | } |
| 525 | 526 | $scope.hfpRangeData.push($scope.hfpValuesFirst, $scope.hfpValuesSecond); |
| 526 | - // console.log('$scope.hfpRangeData', $scope.hfpRangeData); | |
| 527 | + //console.log('$scope.hfpRangeData', $scope.hfpRangeData); | |
| 527 | 528 | |
| 528 | 529 | var chart = nv.models.lineChart() |
| 529 | 530 | .x(function(d) { if(d.length >0){return d[0]}}) |
| ... | ... | @@ -570,20 +571,20 @@ angular.module('acufuel') |
| 570 | 571 | $scope.tmp1 = $scope.td1[2]; |
| 571 | 572 | $scope.td1[2] = $scope.td1[1]; |
| 572 | 573 | $scope.td1[1] = $scope.tmp1; |
| 573 | - $scope.td = $scope.td1.join("-"); | |
| 574 | - | |
| 574 | + $scope.td = $scope.td1.join("-") + " " + '23:59:59'; | |
| 575 | + // console.log("===both dates==",$scope.td) | |
| 575 | 576 | analyticsService.getDRFHfpChart($scope.fd, $scope.td).then(function(result) { |
| 576 | 577 | //console.log("===date range22===",result); |
| 577 | 578 | for(var i=0; i<result.length; i++) { |
| 578 | 579 | if(result[i].includes("JET-A Full Service") ){ |
| 579 | 580 | let datePusha = result[i][0]; |
| 580 | 581 | let tempValue = result[i][1].toFixed(2); |
| 581 | - let valePusha = parseInt(tempValue); | |
| 582 | + let valePusha = parseFloat(tempValue); | |
| 582 | 583 | $scope.hfpValuesFirst.values.push([datePusha, valePusha]) |
| 583 | 584 | }else if(result[i].includes("100LL Full Service") ) { |
| 584 | 585 | let datePushb = result[i][0]; |
| 585 | 586 | let tempvalePushb = result[i][1].toFixed(2); |
| 586 | - let valePushb = parseInt(tempvalePushb); | |
| 587 | + let valePushb = parseFloat(tempvalePushb); | |
| 587 | 588 | $scope.hfpValuesSecond.values.push([datePushb, valePushb]) |
| 588 | 589 | } |
| 589 | 590 | } | ... | ... |