Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

이민희

2022-01-07 ad7e60c5d5a090160c6b9be63c02a75a6c369b91

 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();
            }
        ]);
    }