From 47541162edfd61e732f3f09ea6972c70b1ef6e28 Mon Sep 17 00:00:00 2001
From: "Mr. Hot Foods" <contact@mrhot.in>
Date: Fri, 30 Jun 2017 18:42:22 +0530
Subject: [PATCH] airport upload prgress bar'

---
 app/scripts/config.js                              | 152 ++++++++++++++++++++-
 app/scripts/constant.js                            |   4 +-
 app/views/update-airports/update-airports.html     |  15 +-
 .../update-airports/updateAirportController.js     |  84 ++++++++++--
 app/views/update-airports/updateAirportService.js  |  72 +++++++---
 5 files changed, 297 insertions(+), 30 deletions(-)

diff --git a/app/scripts/config.js b/app/scripts/config.js
index 622b0d8..68b40bf 100755
--- a/app/scripts/config.js
+++ b/app/scripts/config.js
@@ -72,6 +72,154 @@ function config($stateProvider, $urlRouterProvider) {
 angular
     .module('acuefuel')
     .config(config)
-    .run(function($rootScope, $state) {
+    .run(['$rootScope', '$state', 'UpdateAirportService', function($rootScope, $state, UpdateAirportService) {
         $rootScope.$state = $state;
-    });
\ No newline at end of file
+        $rootScope.record = {}
+        
+
+        // var progress1 = "";
+        // $(document).ready(function() {
+        //     progress1 = setInterval(function(){ 
+        //         progressBar();
+        //     }, 3000);
+
+        //     function progressBar(){
+        //         setInterval (function(){
+        //             $('.progress .progress-bar').progressbar({
+        //                 display_text: 'none'
+        //             });
+        //         },1)   
+        //     }
+        // });
+
+        getAllUploadProgress();
+        function getAllUploadProgress() {
+		UpdateAirportService.getAllUploadProgress().then(function(result) {
+			console.log("all results ",result)
+			for(var i =0 ; i<result.length; i++){
+				if(result[i].filetype == 'Airports'){
+					$rootScope.record.AirportCount = result[i].progress
+					$rootScope.record.AirportStatus = result[i].status
+				}
+				else if(result[i].filetype == 'Countries'){
+					$rootScope.record.CountriesCount = result[i].progress
+					$rootScope.record.CountriesStatus = result[i].status
+				}
+				else if(result[i].filetype == 'SubdivisionStates'){
+					$rootScope.record.SubdivisionStatesCount = result[i].progress
+					$rootScope.record.SubdivisionStatesStatus = result[i].status
+				}
+				else if(result[i].filetype == 'FBOHandlerDetail'){
+					$rootScope.record.FBOHandlerDetailCount = result[i].progress
+					$rootScope.record.FBOHandlerDetailStatus = result[i].status
+				}
+				else if(result[i].filetype == 'SupplierDetail'){
+					$rootScope.record.SupplierDetailCount = result[i].progress
+					$rootScope.record.SupplierDetailStatus = result[i].status
+
+				}
+			}
+			
+		})
+
+	}	
+	
+
+
+        var filetypeA = localStorage.getItem('filetypeA')
+        var filetypeC = localStorage.getItem('filetypeC')
+        var filetypeSS = localStorage.getItem('filetypeSS')
+        var filetypeFBO = localStorage.getItem('filetypeFBO')
+        var filetypeSD = localStorage.getItem('filetypeSD')
+        
+        if(filetypeA != null)
+        var uploadStatusA =filetypeA.split(",")[1];
+        if(filetypeC != null)
+        var uploadStatusC =filetypeC.split(",")[1];
+        if(filetypeSS != null)
+        var uploadStatusSS =filetypeSS.split(",")[1];
+        if(filetypeFBO != null)
+        var uploadStatusFBO =filetypeFBO.split(",")[1];
+        if(filetypeSD != null)
+        var uploadStatusSD =filetypeSD.split(",")[1];
+
+        
+
+        if(uploadStatusA != 'Completed' || uploadStatusC != 'Completed' || uploadStatusSS != 'Completed' || uploadStatusFBO != 'Completed' || uploadStatusSD != 'Completed'){
+            var uploadProgress = setInterval(function(){ 
+                uploadData();
+            }, 500);
+        
+            function uploadData() {
+                if(filetypeA != null &&  filetypeA.split(",")[0] == 'Airports'){
+                UpdateAirportService.getUploadProgress(filetypeA.split(",")[0]).then(function(result) {
+                        if(result != null){
+                          $rootScope.record.AirportCount = result.progress
+                          $rootScope.record.AirportStatus = result.status
+                                if($rootScope.record.AirportStatus == 'Completed' || $rootScope.record.AirportStatus == 'Error'){
+                                $rootScope.showAirports = true;
+                                localStorage.removeItem('filetypeA');
+                                localStorage.removeItem('airportLoader');
+                            }
+                        }
+                    })
+                }
+                if(filetypeC != null && filetypeC.split(",")[0] == 'Countries'){
+                UpdateAirportService.getUploadProgress(filetypeC.split(",")[0]).then(function(result) {
+                        if(result != null){
+                          $rootScope.record.CountriesCount = result.progress
+                          $rootScope.record.CountriesStatus = result.status
+                                if($rootScope.record.CountriesStatus == 'Completed' || $rootScope.record.CountriesStatus == 'Error'){
+                                $rootScope.showCountries = true;
+                                localStorage.removeItem('filetypeC');
+                                localStorage.removeItem('countryLoader');
+                                 }
+                                 
+                             }
+                    })
+                }
+                if(filetypeSS != null &&  filetypeSS.split(",")[0] == 'SubdivisionStates'){
+                UpdateAirportService.getUploadProgress(filetypeSS.split(",")[0]).then(function(result) {
+                        if(result != null){
+                          $rootScope.record.SubdivisionStatesCount = result.progress
+	 				      $rootScope.record.SubdivisionStatesStatus = result.status
+                                if($rootScope.record.SubdivisionStatesStatus == 'Completed' || $rootScope.record.SubdivisionStatesStatus == 'Error'){
+                                $rootScope.subDivState = true;
+                                localStorage.removeItem('filetypeSS');
+                                localStorage.removeItem('subDivStateLoader');
+                            }
+                        }
+                    })
+                }
+                if(filetypeFBO != null &&  filetypeFBO.split(",")[0] == 'FBOHandlerDetail'){
+                UpdateAirportService.getUploadProgress(filetypeFBO.split(",")[0] ).then(function(result) {
+                        if(result != null){
+                           $rootScope.record.FBOHandlerDetailCount = result.progress
+	  			           $rootScope.record.FBOHandlerDetailStatus = result.status
+                                if($rootScope.record.FBOHandlerDetailStatus == 'Completed' || $rootScope.record.FBOHandlerDetailStatus == 'Error'){
+                                $rootScope.fboHandlerDetail = true;
+                                localStorage.removeItem('filetypeFBO');
+                                localStorage.removeItem('fboHandleLoader');
+                            }
+                        }
+                    })
+                }
+                if(filetypeSD != null &&  filetypeSD.split(",")[0] == 'SupplierDetail'){
+                UpdateAirportService.getUploadProgress(filetypeSD.split(",")[0]).then(function(result) {
+                        if(result != null){
+                          $rootScope.record.SupplierDetailCount = result.progress
+					      $rootScope.record.SupplierDetailStatus = result.status
+                                if($rootScope.record.SupplierDetailStatus == 'Completed' || $rootScope.record.SupplierDetailStatus == 'Error'){
+                                $rootScope.suppDetail = true;
+                                localStorage.removeItem('filetypeSD');
+                                localStorage.removeItem('suppDetailLoader');
+                            }
+                        }
+                    })
+                }
+            }
+        }else if(uploadStatusA == 'Completed' || uploadStatusC == 'Completed' || uploadStatusSS == 'Completed' || uploadStatusFBO == 'Completed' || uploadStatusSD == 'Completed'){
+            clearInterval(uploadProgress);
+        }
+        
+    }]);
\ No newline at end of file
diff --git a/app/scripts/constant.js b/app/scripts/constant.js
index e75273b..ea3b25a 100644
--- a/app/scripts/constant.js
+++ b/app/scripts/constant.js
@@ -4,5 +4,7 @@
 	angular.module('acuefuel')
 	
 	.constant('BE', {
-		url: 'http://54.149.169.33:8080/ws'
+		// url: 'http://54.149.169.33:8080/ws'
+		// url: 'http://192.168.1.175:8080/ws'
+		url: 'http://192.168.2.137:8080/ws'
 	});
diff --git a/app/views/update-airports/update-airports.html b/app/views/update-airports/update-airports.html
index 52799b5..1ce1588 100644
--- a/app/views/update-airports/update-airports.html
+++ b/app/views/update-airports/update-airports.html
@@ -13,7 +13,7 @@
                     <table class="table table-bordered ">
                         <thead>
                             <tr class="grad">
-                                <th style="background-color: transparent;" colspan="3">
+                                <th style="background-color: transparent;" colspan="5">
                                     <i class="fa fa-list" aria-hidden="true"></i>
                                     <span style="font-size: 15px;font-weight: initial;margin-left: 5px;">Update Airport Data</span>
                                 </th>
@@ -22,6 +22,8 @@
                             <th style="background-color: transparent;">Table</th>
                             <th style="background-color: transparent;">Drop Zone</th>
                             <th style="background-color: transparent;">Updated</th>
+                            <th style="background-color: transparent;">Status</th>
+                            <th style="background-color: transparent;">Records</th>
                         </tr>
                         </thead>
                         <tbody>
@@ -40,8 +42,11 @@
                                   <div class="bounce2"></div>
                                   <div class="bounce3"></div>
                                 </div>
+                                
                             </td>
                             <td>{{newDate}}</td>
+                            <td>{{record.AirportStatus}}</td>
+                            <td>{{record.AirportCount}}</td>
                         </tr>
                         <tr style="background: #fff;">
                             <td>Countries</td>
@@ -60,6 +65,8 @@
                                 </div>
                             </td>
                             <td>{{newDate}}</td>
+                            <td>{{record.CountriesStatus}}</td>
+                            <td>{{record.CountriesCount}}</td>
                         </tr>
                         <tr style="background: #f9f9f9;">
                             <td>FBOHandlerDetail</td>
@@ -78,6 +85,8 @@
                                 </div>
                             </td>
                             <td>{{newDate}}</td>
+                            <td>{{record.FBOHandlerDetailStatus}}</td>
+                            <td>{{record.FBOHandlerDetailCount}}</td>
                         </tr>
                         <tr style="background: #fff;">
                             <td>SubdivisionStates</td>
@@ -96,6 +105,8 @@
                                 </div>
                             </td>
                             <td>{{newDate}}</td>
+                            <td>{{record.SubdivisionStatesStatus}}</td>
+                            <td>{{record.SubdivisionStatesCount}}</td>
                         </tr>
                         <tr style="background: #f9f9f9;">
                             <td>SupplierDetail</td>
@@ -114,6 +125,8 @@
                                 </div>
                             </td>
                             <td>{{newDate}}</td>
+                            <td>{{record.SupplierDetailStatus}}</td>
+                            <td>{{record.SupplierDetailCount}}</td>
                         </tr>
                         </tbody>
                     </table>
diff --git a/app/views/update-airports/updateAirportController.js b/app/views/update-airports/updateAirportController.js
index 070178f..7837ce0 100644
--- a/app/views/update-airports/updateAirportController.js
+++ b/app/views/update-airports/updateAirportController.js
@@ -14,16 +14,19 @@ angular.module('acuefuel')
       	}else{
       		$scope.showAirports = true;
       	}
+		  console.log(localStorage.getItem('countryLoader'))
       	if(localStorage.getItem('countryLoader') == 'false'){
       		$scope.showCountries = false;
       	}else{
       		$scope.showCountries = true;
       	}
+		  console.log(localStorage.getItem('fboHandleLoader'))
       	if(localStorage.getItem('fboHandleLoader') == 'false'){
       		$scope.fboHandlerDetail = false;
       	}else{
       		$scope.fboHandlerDetail = true;
       	}
+		  console.log(localStorage.getItem('subDivStateLoader'))
       	if(localStorage.getItem('subDivStateLoader') == 'false'){
       		$scope.subDivState = false;
       	}else{
@@ -53,7 +56,7 @@ angular.module('acuefuel')
 		$scope.importAirportData = function(fileName) {
 			$scope.showAirports = false;
 			window.localStorage.setItem('airportLoader', false);
-			console.log(fileName)
+			console.log("fileName ---  ",fileName)
 			if(fileName.name != undefined){
 				$scope.dropName = false;
 				$scope.selectedFile = fileName;
@@ -66,11 +69,11 @@ angular.module('acuefuel')
 			var fileCheck = $scope.data.airportFile.name.split('.')[1];
 			console.log(fileCheck)
 			if(fileCheck == 'csv'){
+				$scope.setFileTypeLocal("Airports")
 				UpdateAirportService.updateAirportData($scope.data).then(function(result) {
-					localStorage.removeItem('airportLoader');
+					// localStorage.removeItem('airportLoader');
 					$scope.showAirports = true;
-			  		console.log(result)
-			  	 	toastr.success('Copied', {
+			  	 	toastr.success('File Upload Successfully', {
 		              closeButton: true
 		            })
 				}, function (err) {
@@ -109,10 +112,12 @@ angular.module('acuefuel')
 			var fileCheck = $scope.supplierData.supplierDetailFile.name.split('.')[1];
 			console.log(fileCheck)
 			if(fileCheck == 'csv'){
+				$scope.setFileTypeLocal("SupplierDetail")
 				UpdateAirportService.updateSupplierDetail($scope.supplierData).then(function(result) {
 			  	console.log(result)
 			  		$scope.suppDetail = true;
-			  		localStorage.removeItem('suppDetailLoader');
+			  		// localStorage.removeItem('suppDetailLoader');
+					  console.log("row count ",result)
 			  	 	toastr.success('File Upload Successfully', {
 		              closeButton: true
 		            })
@@ -151,10 +156,11 @@ angular.module('acuefuel')
 			var fileCheck = $scope.countryData.countrieFile.name.split('.')[1];
 			console.log(fileCheck)
 			if(fileCheck == 'csv'){
+				$scope.setFileTypeLocal("Countries")
 				UpdateAirportService.updateCountries($scope.countryData).then(function(result) {
 			  	console.log(result)
 			  		$scope.showCountries = true;
-			  		localStorage.removeItem('countryLoader');
+			  		// localStorage.removeItem('countryLoader');
 			  	 	toastr.success('File Upload Successfully', {
 		              closeButton: true
 		            })
@@ -193,14 +199,15 @@ angular.module('acuefuel')
 			var fileCheck = $scope.subDivisionData.subDivisionStateFile.name.split('.')[1];
 			console.log(fileCheck)
 			if(fileCheck == 'csv'){
+				$scope.setFileTypeLocal("SubdivisionStates")
 				UpdateAirportService.updateSubDivisionState($scope.subDivisionData).then(function(result) {
-			  	console.log(result)
-			  		localStorage.removeItem('subDivStateLoader');
+			  		// localStorage.removeItem('subDivStateLoader');
 			  		$scope.subDivState = true;
 			  	 	toastr.success('File Upload Successfully', {
 		              closeButton: true
 		            })
-				}, function (err) {
+				}, function (error) {
+					console.log("err",error)
 					localStorage.removeItem('subDivStateLoader');
 					$scope.subDivState = true;
 					toastr.error('Error in uploading', {
@@ -235,9 +242,10 @@ angular.module('acuefuel')
 			var fileCheck = $scope.fboHandlerData.FBOHandlerFile.name.split('.')[1];
 			console.log(fileCheck)
 			if(fileCheck == 'csv'){
+				$scope.setFileTypeLocal("FBOHandlerDetail")
 				UpdateAirportService.updateFBOHandler($scope.fboHandlerData).then(function(result) {
 			  	console.log(result)
-			  		localStorage.removeItem('fboHandleLoader');
+			  		// localStorage.removeItem('fboHandleLoader');
 			  		$scope.fboHandlerDetail = true;
 			  	 	toastr.success('File Upload Successfully', {
 		              closeButton: true
@@ -258,5 +266,61 @@ angular.module('acuefuel')
 	            })
 			}
 		}
+	
+	
+	// $scope.getAllUploadProgress = function(){
+	// 	UpdateAirportService.getAllUploadProgress().then(function(result) {
+	// 		console.log("all results ",result)
+	// 		for(var i =0 ; i<result.length; i++){
+	// 			if(result[i].filetype == 'Airports'){
+	// 				$scope.record.AirportCount = result[i].progress
+	// 				$scope.record.AirportStatus = result[i].status
+	// 			}
+	// 			else if(result[i].filetype == 'Countries'){
+	// 				$scope.record.CountriesCount = result[i].progress
+	// 				$scope.record.CountriesStatus = result[i].status
+	// 			}
+	// 			else if(result[i].filetype == 'SubdivisionStates'){
+	// 				$scope.record.SubdivisionStatesCount = result[i].progress
+	// 				$scope.record.SubdivisionStatesStatus = result[i].status
+	// 			}
+	// 			else if(result[i].filetype == 'FBOHandlerDetail'){
+	// 				$scope.record.FBOHandlerDetailCount = result[i].progress
+	// 				$scope.record.FBOHandlerDetailStatus = result[i].status
+	// 			}
+	// 			else if(result[i].filetype == 'SupplierDetail'){
+	// 				$scope.record.SupplierDetailCount = result[i].progress
+	// 				$scope.record.SupplierDetailStatus = result[i].status
+
+	// 			}
+	// 		}
+			
+	// 	})
+
+	// }	
+	// $scope.getAllUploadProgress();
+
+	$scope.setFileTypeLocal = function(value){
+		if(value == 'Airports'){
+		window.localStorage.setItem('filetypeA', value+",InProgress")
+	}
+		else if(value == 'Countries'){
+		window.localStorage.setItem('filetypeC', value+",InProgress")
+	}
+		else if(value == 'SubdivisionStates'){
+		window.localStorage.setItem('filetypeSS', value+",InProgress")
+	}
+		else if(value == 'FBOHandlerDetail'){
+		window.localStorage.setItem('filetypeFBO', value+",InProgress")
+	}
+		else if(value == 'SupplierDetail'){
+		window.localStorage.setItem('filetypeSD', value+",InProgress")
+	}
+
+
+	
+	}
+	
+
 
 })
\ No newline at end of file
diff --git a/app/views/update-airports/updateAirportService.js b/app/views/update-airports/updateAirportService.js
index 8ba8c90..3a41cda 100644
--- a/app/views/update-airports/updateAirportService.js
+++ b/app/views/update-airports/updateAirportService.js
@@ -22,10 +22,11 @@
               headers : {'Content-Type': undefined},
               data : fd
           })
-          .success(function(result) {
+         .then(function (result){
+              deferred.resolve(result);
+          },function (result){
+            console.log(result)
               deferred.resolve(result);
-          }).error(function(error){
-            deferred.reject(error);
           })
           return deferred.promise;
         }
@@ -46,10 +47,11 @@
               headers : {'Content-Type': undefined},
               data : fd
           })
-          .success(function(result) {
+           .then(function (result){
+              deferred.resolve(result);
+          },function (result){
+            console.log(result)
               deferred.resolve(result);
-          }).error(function(error){
-            deferred.reject(error);
           })
           return deferred.promise;
         }
@@ -66,14 +68,15 @@
           $http({
               method : 'POST',
               transformRequest: angular.identity,                    
-              url : BE.url +'/airport/upload/updateCountries',
+              url : BE.url +'/airport/upload/countries',
               headers : {'Content-Type': undefined},
               data : fd
           })
-          .success(function(result) {
+          .then(function (result){
+              deferred.resolve(result);
+          },function (result){
+            console.log(result)
               deferred.resolve(result);
-          }).error(function(error){
-            deferred.reject(error);
           })
           return deferred.promise;
         }
@@ -94,13 +97,16 @@
               headers : {'Content-Type': undefined},
               data : fd
           })
-          .success(function(result) {
+          .then(function (result){
+              deferred.resolve(result);
+          },function (result){
+            console.log(result)
               deferred.resolve(result);
-          }).error(function(error){
-            deferred.reject(error);
           })
           return deferred.promise;
         }
+        
+          
 
         this.updateFBOHandler = function(data) {
 
@@ -118,13 +124,47 @@
               headers : {'Content-Type': undefined},
               data : fd
           })
-          .success(function(result) {
+          .then(function (result){
+              deferred.resolve(result);
+          },function (result){
+            console.log(result)
               deferred.resolve(result);
-          }).error(function(error){
-            deferred.reject(error);
           })
           return deferred.promise;
         }
+
+        this.getUploadProgress = function(filetype) {
+
+            var deferred = $q.defer();
+          $http({
+              method : 'GET',
+              url : BE.url +'/airport/export/records/'+filetype,
+          })
+          .then(function (result){
+              deferred.resolve(result.data);
+          },function (result){
+              deferred.resolve(result.data);
+          })
+          return deferred.promise;
+        }
+
+        this.getAllUploadProgress = function(filetype) {
+
+            var deferred = $q.defer();
+          $http({
+              method : 'GET',
+              url : BE.url +'/airport/export/records',
+          })
+          .then(function (result){
+              deferred.resolve(result.data);
+          },function (result){
+              deferred.resolve(result.data);
+          })
+          return deferred.promise;
+        }
+
+        
+        
    }
 
 })();
\ No newline at end of file
-- 
2.0.0