Commit 938f3037d648d523e0ac3df06609705baab67ba3
1 parent
239310627b
Exists in
master
decimal fixed analytics
Showing
5 changed files
with
9 additions
and
10 deletions
Show diff stats
app/partials/accountSetting/accountSetting.Controller.js
... | ... | @@ -19,7 +19,6 @@ |
19 | 19 | |
20 | 20 | //call this function after upload data |
21 | 21 | function getLoginUserData(){ |
22 | - console.log("===call---") | |
23 | 22 | if($scope.userid && $scope.userid != null && $scope.userid != undefined){ |
24 | 23 | var id = $scope.userid; |
25 | 24 | AccountSettingService.loginUserData(id).then(function(result) { |
... | ... | @@ -36,7 +35,7 @@ |
36 | 35 | |
37 | 36 | } |
38 | 37 | $scope.userData = result; |
39 | - console.log("===userData===",$scope.userData) | |
38 | + //console.log("===userData===",$scope.userData) | |
40 | 39 | $scope.userData.status = $scope.userData.account.user.status.toLowerCase(); |
41 | 40 | $scope.userData.userType = $scope.userData.userType.type.toLowerCase(); |
42 | 41 | }) |
... | ... | @@ -86,7 +85,7 @@ |
86 | 85 | + "&lastName=" + $scope.userData.lastName + "&phone=" + $scope.userData.phone + "&mobile=" + $scope.userData.mobile |
87 | 86 | + "&status=" + $scope.userData.status + "&userType=" + $scope.userData.userType + "&userTypeId=" + $scope.userData.userType.id + "&userProfileId=" + $scope.userid + "&userTimeZone=" + $scope.userData.userTimeZone; |
88 | 87 | |
89 | - console.log("======updateData===",updateData) | |
88 | + // console.log("======updateData===",updateData) | |
90 | 89 | AccountSettingService.updateUserProfile(updateData).then(function(result) { |
91 | 90 | |
92 | 91 | AccountSettingService.updateProducts($scope.productData).then(function(result) { | ... | ... |
app/partials/analytics/analytics.controller.js
... | ... | @@ -25,6 +25,7 @@ angular.module('acufuel') |
25 | 25 | for (var j = 0; j<result.length; j++){ |
26 | 26 | if ($scope.stateList[i].region === result[j].region) { |
27 | 27 | result[j].code = $scope.stateList[i].code; |
28 | + result[j].averagePAP = result[j].averagePAP.toFixed(2); | |
28 | 29 | } |
29 | 30 | } |
30 | 31 | } | ... | ... |
app/partials/login/login.controller.js
... | ... | @@ -34,7 +34,7 @@ |
34 | 34 | $state.go('resetPassword'); |
35 | 35 | } else { |
36 | 36 | LoginService.authenticate().then(function(result){ |
37 | - console.log("==usertime from api===",result) | |
37 | + // console.log("==usertime from api===",result) | |
38 | 38 | window.localStorage.setItem("userTime", JSON.stringify(result.userProfile.userTimeZone)); |
39 | 39 | |
40 | 40 | var currentUserDetail = JSON.parse(window.localStorage.getItem("currentUser")); | ... | ... |
app/partials/main/main.controller.js
... | ... | @@ -16,17 +16,16 @@ |
16 | 16 | if (tempuserTime != null) { |
17 | 17 | if (tempuserTime.slice(0, 1) === "P") { |
18 | 18 | $scope.userTimeZone = tempuserTime.replace("P", "+"); |
19 | - console.log("==p===",$scope.userTimeZone) | |
20 | - console.log("======kd=======") | |
19 | + // console.log("==p===",$scope.userTimeZone) | |
21 | 20 | } else if (tempuserTime.slice(0, 1) === "M") { |
22 | 21 | $scope.userTimeZone = tempuserTime.replace("M", "-"); |
23 | - console.log("==M===",$scope.userTimeZone) | |
22 | + //console.log("==M===",$scope.userTimeZone) | |
24 | 23 | } |
25 | 24 | |
26 | 25 | } else { |
27 | 26 | |
28 | 27 | $scope.userTimeZone = JSON.parse(localStorage.getItem('userTimeZone')); |
29 | - console.log("===$scope.userTimeZone==",$scope.userTimeZone) | |
28 | + //console.log("===$scope.userTimeZone==",$scope.userTimeZone) | |
30 | 29 | } |
31 | 30 | |
32 | 31 | |
... | ... | @@ -39,7 +38,7 @@ |
39 | 38 | $scope.currentUserName = JSON.parse(localStorage.getItem('currentUserName')); |
40 | 39 | $scope.companyName = JSON.parse(localStorage.getItem('companyName')); |
41 | 40 | $scope.userTimeZone = JSON.parse(localStorage.getItem('userTimeZone')); |
42 | - console.log("===$scope.userTimeZone test==",$scope.userTimeZone) | |
41 | + //console.log("===$scope.userTimeZone test==",$scope.userTimeZone) | |
43 | 42 | |
44 | 43 | } |
45 | 44 | ... | ... |
app/partials/scheduler/scheduler.controller.js
... | ... | @@ -17,7 +17,7 @@ angular.module('acufuel') |
17 | 17 | |
18 | 18 | for (var i = 0; i < result.length; i++) { |
19 | 19 | var newTime = new Date(result[i].deployDate); |
20 | - console.log("deployDate",result[i].deployDate) | |
20 | + // console.log("deployDate",result[i].deployDate) | |
21 | 21 | var dmonth = newTime.getUTCMonth() + 1; //months from 1-12 |
22 | 22 | var dday = newTime.getUTCDate(); |
23 | 23 | var dyear = newTime.getUTCFullYear(); | ... | ... |