From 7b21cec8fa57ef7e97ba6628a0cf3750d92ebf84 Mon Sep 17 00:00:00 2001
From: "kuldeep.arora" <kuldeep.arora@viithiisys.com>
Date: Mon, 3 Sep 2018 16:28:14 +0530
Subject: [PATCH] analytical regional pap chart

---
 app/index.html                                 |  11 ++-
 app/partials/analytics/analytics.controller.js | 103 ++++++++++++++++++++++++-
 app/partials/analytics/analytics.html          |  29 +++++--
 app/partials/analytics/analytics.service.js    |  18 ++++-
 app/partials/dashboard/dashboard.html          |   2 +-
 app/partials/main/main.controller.js           |   2 +-
 app/partials/main/main.html                    |   1 +
 7 files changed, 149 insertions(+), 17 deletions(-)

diff --git a/app/index.html b/app/index.html
index 3728a30..9f3bf62 100644
--- a/app/index.html
+++ b/app/index.html
@@ -117,14 +117,17 @@
       <script src="scripts/inspinia.js"></script>
       <script src="plugins/iCheck/icheck.min.js"></script>
        -->
-      
-<!--       <script src="./js/Application.js"></script>
+       
+      <!-- This 7 lines are for old regional chart-->
+      <!-- <script src="./js/Application.js"></script>
      <script src="js/charts/area.js"></script>
       <script src="js/charts/donut.js"></script>
       <script src="js/charts/pie.js"></script>
       <script src="js/charts/bar.js"></script>
       <script src="js/demo/validation.js"></script>
-      <script src="js/charts/line.js"></script> --> 
+      <script src="js/charts/line.js"></script>  -->
+
+
       <script src="js/demo/faq.js"></script>
       <script src="js/plugins/faq/faq.js"></script>
       <script src="js/demo/gallery.js"></script>
@@ -239,7 +242,7 @@
      
       <script src="bower_components/angular-nvd3/dist/angular-nvd3.js"></script>
 
-      <!-- for reginal pap graph -->
+      <!-- for reginal pap graph uncomment this for new red chart and html code-->
       <script src="https://code.jquery.com/jquery-3.1.1.min.js"></script>
       <script src="https://code.highcharts.com/maps/js/highmaps.js"></script>
       <script src="https://code.highcharts.com/maps/js/modules/data.js"></script>
diff --git a/app/partials/analytics/analytics.controller.js b/app/partials/analytics/analytics.controller.js
index 9114f38..47aac7b 100644
--- a/app/partials/analytics/analytics.controller.js
+++ b/app/partials/analytics/analytics.controller.js
@@ -2,7 +2,101 @@
 angular.module('acufuel')
     .controller('analyticsController', ['$scope', 'analyticsService', function($scope, analyticsService) {
 
-        $(document).ready(function() {
+
+         
+        $scope.getAllRegionalPap = function() {
+            $scope.flag=true;
+            $scope.stateList = [{region:'Alabama',code:'AL'},{region:'Alaska',code:'AK'},{region:'Arizona',code:'AZ'},{region:'Arkansas',code:'AR'},
+                {region:'California',code:'CA' },{region:'Colorado',code:'CO'},{region:'Connecticut',code:'CT'},{region:'Delaware',code:'DE'},
+                {region:'Florida' ,code:'FL'},{region:'Georgia' ,code:'GA'},{region:'Hawaii' ,code:'HI'},{region:'Idaho' ,code:'ID'},
+                {region:'Illinois',code:'IL'},{region:'Indiana' ,code:'IN'},{region:'Iowa' ,code:'IA'},{region:'Kansas' ,code:'KS'},
+                {region:'Kentucky' ,code:'KY'},{region:'Louisiana' ,code:'LA'},{region:'Maine' ,code:'ME'},{region:'Maryland' ,code:'MD'},
+                {region:'Massachusetts' ,code:'MA'},{region:'Michigan' ,code:'MI'},{region:'Minnesota' ,code:'MN'},
+                {region:'Mississippi' ,code:'MS'},{region:'Missouri' ,code:'MO'},{region:'Montana',code:'MT'},{region:'Nebraska' ,code:'NE'},
+                {region:'Nevada' ,code:'NV'},{region:'New Hampshire' ,code:'NH'},{region:'New Jersey' ,code:'NJ'},{region:'New Mexico' ,code:'NM'},
+                {region:'New York' ,code:'NY'},{region:'North Carolina' ,code:'NC'},{region:'North Dakota' ,code:'ND'},{region:'Ohio' ,code:'OH'},
+                {region:'Oklahoma' ,code:'OK'},{region:'Oregon' ,code:'OR'},{region:'Pennsylvania',code:'PA'},{region:'Rhode Island' ,code:'RI'},
+                {region:'South Carolina' ,code:'SC'},{region:'South Dakota' ,code:'SD'},{region:'Tennessee' ,code:'TN'},{region:'Texas' ,code:'TX'},
+                {region:'Utah' ,code:'UT'},{region:'Vermont' ,code:'VT'},{region:'Virginia' ,code:'VA'},{region:'Washington' ,code:'WA'},
+                {region:'West Virginia' ,code:'WV'},{region:'Wisconsin' ,code:'WI'},{region:'Wyoming',code:'WY'}]
+           
+            analyticsService.getAllRPP().then(function(result) {
+                    for (var i = 0; i < $scope.stateList.length; i++) {
+                        for (var j = 0; j<result.length; j++){
+                            if ($scope.stateList[i].region === result[j].region) {
+                                result[j].code = $scope.stateList[i].code; 
+                            }
+                        }                   
+                    }
+                     $scope.flag=false;
+                    // Instantiate the map
+                    Highcharts.mapChart('regional-pap', {
+
+                        chart: {
+                            map: 'countries/us/us-all',
+                            borderWidth: 1,
+                        },
+
+                        title: {
+                            text: 'Regional PAP'
+                        },
+
+                        exporting: {
+                            sourceWidth: 600,
+                            sourceHeight: 500
+                        },
+
+                        legend: {
+                            layout: 'vertical',
+                            borderWidth: 0,
+                            backgroundColor: 'rgba(255,255,255,0.85)',
+                            floating: true,
+                            width:'12px',
+                            height:'200px',
+                            verticalAlign: 'bottom',
+                            y: 0,
+                            x: -230,
+                        },
+
+                        mapNavigation: {
+                            enabled: true
+                        },
+
+                        /* colorAxis: {
+                             min: 1,
+                             type: 'logarithmic',
+                             minColor: '#2b908f',
+                             maxColor: '#000022',
+                             stops: [
+                                 [0, '#EFEFFF'],
+                                 [5, '#f45b5b'],
+                                 [10, 'rgb(117,0,0)']
+                             ]
+                         },*/
+
+                        series: [{
+                            animation: {
+                                duration: 1000
+                            },
+                            data: result,
+                            joinBy: ['postal-code', 'code'],
+                            dataLabels: {
+                                enabled: true,
+                                color: '#FFFFFF',
+                                format: '{point.code}'
+                            },
+                            name: 'Data' ,
+                            tooltip: {
+                                pointFormat: '{point.region} : {point.averagePAP}'
+                            },
+                        }]
+                    });
+            })
+        }
+
+        $scope.getAllRegionalPap();
+        
+        /*$(document).ready(function() {
             $(function() {
                 jQuery('#map').vectorMap({
                     map: 'us_lcc',
@@ -23,7 +117,8 @@ angular.module('acufuel')
                     normalizeFunction: 'polynomial'
                 });
             });
-        })
+        })*/
+
 
         function getRegionPap(code) {
             $scope.showLoader = true;
@@ -33,6 +128,7 @@ angular.module('acufuel')
                 $('#popup1').css('display', 'block');
             })
         }
+
         $scope.cancelStatus = function() {
             $('#popup1').css('display', 'none');
         }
@@ -135,7 +231,7 @@ angular.module('acufuel')
             //var makeId = makeId;
             analyticsService.gethfpChart().then(function(result) {
                 $scope.hfpValues = result;
-                console.log('---kd result--',$scope.hfpValues);
+                //console.log('---kd result--',$scope.hfpValues);
                 
         /*Historic Fuel Price */
         
@@ -519,5 +615,4 @@ angular.module('acufuel')
         }
 
 
-
     }]);
\ No newline at end of file
diff --git a/app/partials/analytics/analytics.html b/app/partials/analytics/analytics.html
index e03c3ee..c0f7277 100644
--- a/app/partials/analytics/analytics.html
+++ b/app/partials/analytics/analytics.html
@@ -20,10 +20,21 @@
     
    }
 
-   
+   .highcharts-button-box{
+    display: none;
+   }
+   .highcharts-map-navigation{
+    background-color: #eee;
+    border-color: grey;
+   }
 
-   
+   /*.highcharts-legend{
+    transform: unset;
+    margin-top: 250px;
+   }*/
+@import 'https://code.highcharts.com/css/themes/sand-signika.css';   
 </style>
+
 <div class="main">
   <div style="padding: 0 3%; margin-left: 15px;">
     <div class="row">
@@ -140,7 +151,11 @@
                   </div>
                   <!-- /widget-header -->
                   <div class="widget-content">
-                    <div id="map" style="width: 100%; height: 325px;"></div>
+                    <div ng-show="flag">
+                     <center><img id="spinner" src="/img/spinner.gif"/></center>  
+                    </div>
+                    <!-- <div id="map" style="width: 100%; height: 325px;"></div> -->
+                    <div ng-hide="flag" id="regional-pap" style="height: 400px; min-width: 310px; max-width: 600px; margin: 0 auto"></div>
                   </div>
                   <!-- /widget-content -->
                 </div>
@@ -176,8 +191,10 @@
                   </div>
                </div>
             </div>
-            <div class="myLoader" ng-show="showLoader">
-            <img src="../img/hourglass.gif" width="50px;">
-          </div>
+            
         
 
+ 
+
+
+ 
diff --git a/app/partials/analytics/analytics.service.js b/app/partials/analytics/analytics.service.js
index b2cc69f..6b1b57c 100644
--- a/app/partials/analytics/analytics.service.js
+++ b/app/partials/analytics/analytics.service.js
@@ -55,6 +55,7 @@
             return deferred.promise;
         }
 
+        /* With region Code */
         this.getRPP = function(code){
             var deferred = $q.defer();
             $http({
@@ -69,7 +70,22 @@
             })
             return deferred.promise;
         }
-
+        
+        /* without region code */
+        this.getAllRPP = function(){
+            var deferred = $q.defer();
+            $http({
+                method : 'GET',
+                url : BASE_URL.url +'/fuelerlinx/getAllRegionalPap'
+            })
+            .then(function (result){
+                deferred.resolve(result.data);
+            },function (result){
+              console.log(result)
+                deferred.resolve(result.data);
+            })
+            return deferred.promise;
+        }
 
          /*---date filter for Monthly fuel sales chart - dates are sending to the api  */
         this.getDRFChart = function(fd,td){
diff --git a/app/partials/dashboard/dashboard.html b/app/partials/dashboard/dashboard.html
index 6ca2234..2a3b24a 100644
--- a/app/partials/dashboard/dashboard.html
+++ b/app/partials/dashboard/dashboard.html
@@ -219,4 +219,4 @@ table tr:nth-child(even) {
                      <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelAndCloseConfirm()">Cancel</button>
                   </div>
                </div>
-            </div>
\ No newline at end of file
+         </div>
diff --git a/app/partials/main/main.controller.js b/app/partials/main/main.controller.js
index 7fa525d..863d149 100644
--- a/app/partials/main/main.controller.js
+++ b/app/partials/main/main.controller.js
@@ -25,7 +25,7 @@
             $rootScope.isAuthenticated = false;
 
         }
-        
+
         /** 
              Automatic logout session after 2 hours 
         **/
diff --git a/app/partials/main/main.html b/app/partials/main/main.html
index a7dd239..f868448 100644
--- a/app/partials/main/main.html
+++ b/app/partials/main/main.html
@@ -118,6 +118,7 @@
                   <span>Flight Tracking</span>
                   </a>              
                </li>
+
                <li ng-if="!isAuthenticated">
                   <a ui-sref="app.flightDepDashboard">
                   <i class="fa fa-search"></i>
-- 
2.0.0