From ad7e60c5d5a090160c6b9be63c02a75a6c369b91 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 07 1월 2022 14:10:15 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/scripts/app/user/userDetail.controller.js | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/scripts/app/user/userDetail.controller.js b/src/main/webapp/scripts/app/user/userDetail.controller.js
index 11714a5..2ef6651 100644
--- a/src/main/webapp/scripts/app/user/userDetail.controller.js
+++ b/src/main/webapp/scripts/app/user/userDetail.controller.js
@@ -7,11 +7,12 @@
'app'
],
function (app) {
- app.controller('userDetailController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$tableProvider', 'IssueHistory', '$uibModal', 'SweetAlert', '$filter',
- function ($scope, $rootScope, $log, $resourceProvider, $tableProvider, IssueHistory, $uibModal, SweetAlert, $filter) {
+ app.controller('userDetailController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$tableProvider', 'IssueHistory', '$uibModal', 'SweetAlert', '$filter', 'User',
+ function ($scope, $rootScope, $log, $resourceProvider, $tableProvider, IssueHistory, $uibModal, SweetAlert, $filter, User) {
// �븿�닔
$scope.fn = {
+ getMyInfo : getMyInfo, //�굹�쓽 �젙蹂� 議고쉶(�벑湲�, �떞�떦遺��꽌)
getIssueHistoryList : getIssueHistoryList, // �씠�뒋 湲곕줉 �젙蹂� 議고쉶
modify : modify, // �궗�슜�옄 �닔�젙
changeSearchPeriod : changeSearchPeriod, // �씠�젰 議고쉶 寃��깋 議곌굔 蹂�寃�
@@ -25,7 +26,10 @@
startEndDateRange : "" // �씠�뒋 湲곕줉 議고쉶 �궇吏�
},
issueHistoryVos : [], // �씠�뒋 湲곕줉 �젙蹂�
- issueHistoryDates : [] // �씠�뒋 湲곕줉 �젙蹂� �궇吏�
+ issueHistoryDates : [], // �씠�뒋 湲곕줉 �젙蹂� �궇吏�
+ myLevel : "",
+ myDepartments : [],
+ phone : ""
};
// 吏곸젒 �엯�젰�뿉�꽌 �궇吏� �꽑�깮�떆 �씠�뒋 湲곕줉 �젙蹂� 議고쉶
@@ -65,6 +69,27 @@
id : id
};
}
+ }
+ });
+ }
+
+ // �굹�쓽 �젙蹂� 議고쉶(�벑湲�, �떞�떦遺��꽌)
+ function getMyInfo() {
+
+ User.findMyLevelAndDepartment($resourceProvider.getContent(
+ $resourceProvider.getPageContent(0, 0))).then(function (result) {
+
+ if (result.data.message.status === "success") {
+ $scope.vm.myLevel = result.data.data.levelName;
+ $scope.vm.myDepartments = result.data.data.departmentName;
+ // �쟾�솕踰덊샇 �븯�씠�뵂 異붽��븯�뿬 議고쉶
+ $scope.vm.phone = $rootScope.user.phone;
+ let hyphen = $scope.vm.phone.trim();
+ let phone = hyphen.replace(/(^02.{0}|^01.{1}|[0-9]{3})([0-9]+)([0-9]{4})/,"$1-$2-$3");
+ $rootScope.user.phone = phone;
+ }
+ else {
+ SweetAlert.swal($filter("translate")("users.failedToRetrieveIssueHistory"), result.data.message.message, "error"); // "�씠�뒋 湲곕줉 �젙蹂� 議고쉶 �떎�뙣"
}
});
}
@@ -118,7 +143,7 @@
// �씠�뒋 湲곕줉 �젙蹂� 議고쉶
$scope.fn.getIssueHistoryList();
-
+ $scope.fn.getMyInfo();
}
]);
}
--
Gitblit v1.8.0