From bb639860c4afc574f05cabbc136e08d944ee42ad Mon Sep 17 00:00:00 2001 From: Rishav Date: Wed, 31 May 2017 11:16:47 +0530 Subject: [PATCH] account setting page implementation with api --- .../accountSetting/accountSetting.Controller.js | 51 +++++++++++++++++++- .../accountSetting/accountSetting.Service.js | 55 +++++++++++++++++++++- app/partials/accountSetting/accountSetting.html | 28 ++++++----- 3 files changed, 119 insertions(+), 15 deletions(-) diff --git a/app/partials/accountSetting/accountSetting.Controller.js b/app/partials/accountSetting/accountSetting.Controller.js index 6c5455e..ef26614 100644 --- a/app/partials/accountSetting/accountSetting.Controller.js +++ b/app/partials/accountSetting/accountSetting.Controller.js @@ -6,10 +6,57 @@ .controller('AccountSettingController', [ '$scope', '$filter', '$rootScope', '$state', 'AccountSettingService', AccountSettingController]); function AccountSettingController($scope, $filter, $rootScope, $state, AccountSettingService) { - + $scope.addArray = []; + $scope.userData = {}; + $scope.userid = JSON.parse(localStorage.getItem('userProfileId')); + if($scope.userid && $scope.userid != null && $scope.userid != undefined){ + var id = $scope.userid; + AccountSettingService.loginUserData(id).then(function(result) { + $scope.userData = result; + $scope.userData.status = $scope.userData.account.user.status.toLowerCase(); + $scope.userData.userType = $scope.userData.userType.type.toLowerCase(); + }) + } + AccountSettingService.getProducts().then(function(result) { - + $scope.productList = result; + for(var i=0;i<$scope.productList.length;i++){ + var obj = { + id : $scope.productList[i].id, + name : $scope.productList[i].name, + status : $scope.productList[i].status + } + $scope.addArray.push(obj); + } }) + + $scope.productData = {}; + $scope.productData.productList = []; + + $scope.checkProduct = function(productlist, product, index){ + $scope.addArray[index].id = productlist[index].id; + $scope.addArray[index].name = productlist[index].name; + $scope.addArray[index].status = productlist[index].status; + $scope.productData.productList = $scope.addArray; + console.log($scope.productData) + } + + $scope.updateUser = function(){ + + var updateData = "companyName=" + $scope.userData.companyName + "&username=" + $scope.userData.username + "&firstName=" + $scope.userData.firstName + + "&lastName=" + $scope.userData.lastName + "&phone=" + $scope.userData.phone + "&mobile=" + $scope.userData.mobile + + "&status=" + $scope.userData.status + "&userType=" + $scope.userData.userType + "&userTypeId=" + $scope.userData.userType.id + "&userProfileId=" + $scope.userid; + + AccountSettingService.updateUserProfile(updateData).then(function(result) { + + AccountSettingService.updateProducts($scope.productData).then(function(result) { + toastr.success(''+result.success+'', { + closeButton: true + }) + }) + + }) + } } })(); diff --git a/app/partials/accountSetting/accountSetting.Service.js b/app/partials/accountSetting/accountSetting.Service.js index d4369fd..9e69d66 100644 --- a/app/partials/accountSetting/accountSetting.Service.js +++ b/app/partials/accountSetting/accountSetting.Service.js @@ -5,7 +5,7 @@ function AccountSettingService($rootScope, $q, $http, $state, BASE_URL) { - this.getProducts = function(data) { + this.getProducts = function() { var deferred = $q.defer(); $http({ @@ -22,6 +22,59 @@ return deferred.promise; } + this.updateProducts = function(data) { + + var deferred = $q.defer(); + $http({ + method : 'PUT', + url : BASE_URL.url +'/fuelPricing/product', + data : data, + headers : {'Content-Type': 'application/json'}, + }) + .then(function (result){ + deferred.resolve(result.data); + },function (result){ + //console.log(result.data) + deferred.resolve(result.data); + }) + return deferred.promise; + } + + this.loginUserData = function(id) { + + var deferred = $q.defer(); + $http({ + method : 'GET', + url : BASE_URL.url +'/account/user/'+id, + headers : {'Content-Type': 'application/json'}, + }) + .then(function (result){ + deferred.resolve(result.data); + },function (result){ + //console.log(result.data) + deferred.resolve(result.data); + }) + return deferred.promise; + } + + this.updateUserProfile = function(data) { + + var deferred = $q.defer(); + $http({ + method : 'PUT', + url : BASE_URL.url +'/account/updateProfile', + headers : {'Content-Type': 'application/x-www-form-urlencoded'}, + data: data + }) + .then(function (result){ + deferred.resolve(result.data); + },function (result){ + //console.log(result.data) + deferred.resolve(result.data); + }) + return deferred.promise; + } + } })(); \ No newline at end of file diff --git a/app/partials/accountSetting/accountSetting.html b/app/partials/accountSetting/accountSetting.html index dad8de1..826f18a 100644 --- a/app/partials/accountSetting/accountSetting.html +++ b/app/partials/accountSetting/accountSetting.html @@ -11,15 +11,15 @@

Castle & Cooke FBO


-
-
-
+
+
+
-
-
-
+ +
+
@@ -28,17 +28,21 @@
-
- Jet-A: Full Service
- Jet-A: w/Additive
- Jet-A: Self Service
- 100LL: Full Service
- 100LL: Self Service +
+
+
+
+ + +
-- 2.0.0