부서,등급 파일명 변경

이민희

2021-11-12 29b3e2f7ca000ca83ace5a2f71bb7ca753145df9

부서,등급 파일명 변경

 src/main/webapp/scripts/app/workspace/departmentModify.controller.js

File was deleted

 src/main/webapp/scripts/app/workspace/workspace.js

@@ -34,7 +34,7 @@
                            var deferred = $q.defer();
                            require(["modalFormAutoScroll", "workspaceController", "workspaceLevelAddController", "workspaceDepartmentAddController", "workspacePaymentExecuteController", "workspaceUserConfigController", "workspacePaymentModifyController",
                                "workspacePaymentAgreeTermController", "paymentService", "userWorkspaceService", "workspaceService", "numberOnly", 'jsTable', 'tableColumnGenerator', 'summerNote', 'summerNote-ko-KR', 'formSubmit',
                                "crypto", "reservationDisableUserService", "workspacePaymentAddController", "workspaceUserLevelController", "workspaceDepartmentConfigController", "levelModifyController","departmentModifyController","workspaceDepartmentModifyController"], function () {
                                "crypto", "reservationDisableUserService", "workspacePaymentAddController", "workspaceUserLevelController", "workspaceDepartmentConfigController", "workspaceLevelModifyController","workspaceDepartmentModifyController","workspaceUserDepartmentModifyController"], function () {
                                deferred.resolve();
                            });


 src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js

@@ -139,9 +139,9 @@
                //  부서 수정
                function departmentModify(id) {
                    $uibModal.open({
                        templateUrl : 'views/workspace/departmentModify.html',
                        templateUrl : 'views/workspace/workspaceDepartmentModify.html',
                        size : "md",
                        controller : 'departmentModifyController',
                        controller : 'workspaceDepartmentModifyController',
                        backdrop : 'static',
                        resolve : {
                            parameter : function () {

 src/main/webapp/scripts/app/workspace/workspaceDepartmentModify.controller.js

@@ -8,43 +8,44 @@
        'angular'
    ],
    function (app, angular) {
        app.controller('workspaceDepartmentModifyController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$uibModalInstance', 'UserWorkspace', 'parameter', 'SweetAlert', '$filter', '$injector', '$controller',
            function ($scope, $rootScope, $log, $resourceProvider, $uibModalInstance, UserWorkspace, parameter, SweetAlert, $filter, $injector, $controller) {
        app.controller('workspaceDepartmentModifyController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$uibModalInstance', 'UserWorkspace', 'parameter', 'SweetAlert', '$filter',
            function ($scope, $rootScope, $log, $resourceProvider, $uibModalInstance, UserWorkspace, parameter, SweetAlert, $filter) {

                $scope.fn = {
                    detail : detail,  //  상세 조회
                    cancel : cancel,    //  팝업 창 닫기
                    formSubmit : formSubmit,    //  폼 전송
                    formCheck : formCheck,  //  폼 체크
                    detail : detail,    //  상세 정보 조회
                    removeDepartments : removeDepartments,  //  추가한 부서 제거
                    getDepartmentListCallBack : getDepartmentListCallBack
                };

                $scope.vm = {
                    id : parameter.id,
                    userId : parameter.userId,
                    form : {
                        departments : [] // 부서
                    },
                    departmentName : "", //부서명 검색
                    /*autoCompletePage : {
                        project : {
                            page : 0,
                            totalPage : 0
                        }
                    },*/
                        departmentName : "",
                        departmentDescription : ""
                    }
                };
                angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector}));

                function getDepartmentListCallBack(result) {
                    console.log("TEST");
                //  상세 정보
                function detail() {
                    var conditions = {
                        id : parameter.id
                    }

                }
                    UserWorkspace.departmentDetail($resourceProvider.getContent(
                        conditions,
                        $resourceProvider.getPageContent(0, 1))).then(function (result) {


                //  선택 한 부서 제거
                function removeDepartments(index) {
                    $scope.vm.form.departments.splice(index, 1);
                        if (result.data.message.status === "success") {
                            if (angular.isDefined(result.data.data)) {
                                $scope.vm.form.departmentName = result.data.data.departmentName;
                                $scope.vm.form.departmentDescription = result.data.data.departmentDescription;
                            }
                        }
                        else {
                            SweetAlert.swal($filter("translate")("customField.failedToDetailUserDefinedFields"), result.data.message.message, "error"); // "사용자 정의 필드 상세 정보 조회 실패"
                        }
                    });
                }

                function formCheck(formInvalid) {
@@ -60,25 +61,19 @@
                    $rootScope.spinner = true;

                    var content = {
                        id : $scope.vm.id,
                        userId : $scope.vm.userId,
                        ids : (function () {
                            var departmentIds = [];
                            angular.forEach($scope.vm.form.departments, function (department) {
                                departmentIds.push(department.id);
                            });
                            return departmentIds;
                        })()
                        id : parameter.id,
                        departmentName : $rootScope.preventXss($scope.vm.form.departmentName),
                        departmentDescription : $rootScope.preventXss($scope.vm.form.departmentDescription)
                    };

                    UserWorkspace.userDepartmentModify($resourceProvider.getContent(
                    UserWorkspace.departmentModify($resourceProvider.getContent(
                        content,
                        $resourceProvider.getPageContent(0, 0))).then(function (result) {

                        if (result.data.message.status === "success") {
                            $scope.fn.cancel();
                            //  목록 화면 갱신
                            $rootScope.$broadcast("getUserWorkspaceList", {});
                            $rootScope.$broadcast("getDepartmentList", {});
                        }
                        else {
                            SweetAlert.error($filter("translate")("managementWorkspace.failedDepartmentRegistration"), result.data.message.message);
@@ -94,27 +89,6 @@
                    $rootScope.$broadcast("closeLayer");    //  팝업이 열리고 나서 js-multi, js-single 등에서 body 이벤트가 날아가는 현상 수정
                    $uibModalInstance.dismiss('cancel');
                    $(document).unbind("keydown");  //  단축키 이벤트 제거
                }

                function detail() {
                    var contents = {
                        id : parameter.id,
                        userId : parameter.userId
                    }

                    UserWorkspace.userDepartmentDetail($resourceProvider.getContent(//test
                        contents,
                        $resourceProvider.getPageContent(0, 1))).then(function (result) {

                        if (result.data.message.status === "success") {
                            if (angular.isDefined(result.data.data)) {
                                $scope.vm.form.departments = result.data.data;
                            }
                        }
                        else {
                            SweetAlert.error($filter("translate")("managementWorkspace.failedToDepartmentsOfUserDetails"), result.data.message.message); //"사용자의 부서 상세 정보 조회 실패"
                        }
                    });
                }

                $scope.fn.detail();

 src/main/webapp/scripts/app/workspace/workspaceLevelModify.controller.js

File was renamed from src/main/webapp/scripts/app/workspace/levelModify.controller.js
@@ -8,7 +8,7 @@
        'angular'
    ],
    function (app, angular) {
        app.controller('levelModifyController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$uibModalInstance', 'UserWorkspace', 'parameter', 'SweetAlert', '$filter',
        app.controller('workspaceLevelModifyController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$uibModalInstance', 'UserWorkspace', 'parameter', 'SweetAlert', '$filter',
            function ($scope, $rootScope, $log, $resourceProvider, $uibModalInstance, UserWorkspace, parameter, SweetAlert, $filter) {

                $scope.fn = {
@@ -72,7 +72,7 @@
                        //description : $rootScope.preventXss($scope.vm.form.description)
                    };

                    UserWorkspace.modifyLevel($resourceProvider.getContent(condition,
                    UserWorkspace.levelModify($resourceProvider.getContent(condition,
                        content,
                        $resourceProvider.getPageContent(0, 0))).then(function (result) {


 src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js

@@ -273,9 +273,9 @@
                //  사용자가 속해있는 부서 수정 팝업
                function modifyUserDepartments(id, userId) {
                    $uibModal.open({
                        templateUrl : 'views/workspace/workspaceDepartmentModify.html',
                        templateUrl : 'views/workspace/workspaceUserDepartmentModify.html',
                        size : "xlg",
                        controller : 'workspaceDepartmentModifyController',
                        controller : 'workspaceUserDepartmentModifyController',
                        backdrop : 'static',
                        windowClass : 'workflow-window',
                        resolve : {

 src/main/webapp/scripts/app/workspace/workspaceUserDepartmentModify.controller.js

New file
@@ -0,0 +1,123 @@
/**
 * Created by wisestone on 2018-05-08.
 */
'use strict';

define([
        'app',
        'angular'
    ],
    function (app, angular) {
        app.controller('workspaceUserDepartmentModifyController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$uibModalInstance', 'UserWorkspace', 'parameter', 'SweetAlert', '$filter', '$injector', '$controller',
            function ($scope, $rootScope, $log, $resourceProvider, $uibModalInstance, UserWorkspace, parameter, SweetAlert, $filter, $injector, $controller) {

                $scope.fn = {
                    cancel : cancel,    //  팝업 창 닫기
                    formSubmit : formSubmit,    //  폼 전송
                    formCheck : formCheck,  //  폼 체크
                    detail : detail,    //  상세 정보 조회
                    removeDepartments : removeDepartments,  //  추가한 부서 제거
                    getDepartmentListCallBack : getDepartmentListCallBack
                };

                $scope.vm = {
                    id : parameter.id,
                    userId : parameter.userId,
                    form : {
                        departments : [] // 부서
                    },
                    departmentName : "", //부서명 검색
                    /*autoCompletePage : {
                        project : {
                            page : 0,
                            totalPage : 0
                        }
                    },*/
                };
                angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector}));

                function getDepartmentListCallBack(result) {
                    console.log("TEST");

                }


                //  선택 한 부서 제거
                function removeDepartments(index) {
                    $scope.vm.form.departments.splice(index, 1);
                }

                function formCheck(formInvalid) {
                    if (formInvalid) {
                        return true;
                    }

                    return false;
                }

                //  폼 전송
                function formSubmit() {
                    $rootScope.spinner = true;

                    var content = {
                        id : $scope.vm.id,
                        userId : $scope.vm.userId,
                        ids : (function () {
                            var departmentIds = [];
                            angular.forEach($scope.vm.form.departments, function (department) {
                                departmentIds.push(department.id);
                            });
                            return departmentIds;
                        })()
                    };

                    UserWorkspace.userDepartmentModify($resourceProvider.getContent(
                        content,
                        $resourceProvider.getPageContent(0, 0))).then(function (result) {

                        if (result.data.message.status === "success") {
                            $scope.fn.cancel();
                            //  목록 화면 갱신
                            $rootScope.$broadcast("getUserWorkspaceList", {});
                        }
                        else {
                            SweetAlert.error($filter("translate")("managementWorkspace.failedDepartmentRegistration"), result.data.message.message);
                        }

                        $rootScope.spinner = false;
                    });

                }

                //  팝업 창 닫기
                function cancel() {
                    $rootScope.$broadcast("closeLayer");    //  팝업이 열리고 나서 js-multi, js-single 등에서 body 이벤트가 날아가는 현상 수정
                    $uibModalInstance.dismiss('cancel');
                    $(document).unbind("keydown");  //  단축키 이벤트 제거
                }

                function detail() {
                    var contents = {
                        id : parameter.id,
                        userId : parameter.userId
                    }

                    UserWorkspace.userDepartmentDetail($resourceProvider.getContent(//test
                        contents,
                        $resourceProvider.getPageContent(0, 1))).then(function (result) {

                        if (result.data.message.status === "success") {
                            if (angular.isDefined(result.data.data)) {
                                $scope.vm.form.departments = result.data.data;
                            }
                        }
                        else {
                            SweetAlert.error($filter("translate")("managementWorkspace.failedToDepartmentsOfUserDetails"), result.data.message.message); //"사용자의 부서 상세 정보 조회 실패"
                        }
                    });
                }

                $scope.fn.detail();

            }]);
    });

 src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js

@@ -75,7 +75,7 @@
                    $uibModal.open({
                        templateUrl : 'views/workspace/workspaceLevelModify.html',
                        size : "md",
                        controller : 'levelModifyController',
                        controller : 'workspaceLevelModifyController',
                        backdrop : 'static',
                        resolve : {
                            parameter : function () {

 src/main/webapp/scripts/main.js

@@ -224,15 +224,15 @@
        'workspacePaymentModifyController' : 'app/workspace/workspacePaymentModify.controller', //  결재 수정 컨트롤러
        'workspacePaymentAddController' : 'app/workspace/workspacePaymentAdd.controller',   //  추가 결제 컨트롤러
        'workspacePaymentAgreeTermController' : 'app/workspace/workspacePaymentAgreeTerm.controller', //  업무 공간 이용 약관 확인 컨트롤러
        'workspaceUserLevelController' : 'app/workspace/workspaceUserLevelConfig.controller',  //  사용자 관리 컨트롤러
        'workspaceUserLevelController' : 'app/workspace/workspaceUserLevelConfig.controller',  //  사용자 등급 관리 컨트롤러
        'workspaceLevelAddController' : 'app/workspace/workspaceLevelAdd.controller',  //  사용자 등급 추가 컨트롤러
        'levelModifyController' : 'app/workspace/levelModify.controller',  //  사용자 등급 수정 컨트롤러
        'departmentModifyController' : 'app/workspace/departmentModify.controller',  //  부서 수정 컨트롤러
        'workspaceLevelModifyController' : 'app/workspace/workspaceLevelModify.controller',  //  사용자 등급 수정 컨트롤러
        'workspaceDepartmentModifyController' : 'app/workspace/workspaceDepartmentModify.controller',  //  부서 수정 컨트롤러
        'workspaceDepartmentAddController' : 'app/workspace/workspaceDepartmentAdd.controller',  //  부서 추가 컨트롤러
        'workspaceDepartmentConfigController' : 'app/workspace/workspaceDepartmentConfig.controller',  //  사용자 부서 관리 컨트롤러
        'workspaceDepartmentConfigController' : 'app/workspace/workspaceDepartmentConfig.controller',  //  부서 관리 컨트롤러
        'workspaceUserDepartmentModifyController' : 'app/workspace/workspaceUserDepartmentModify.controller',  //  사용자 부서 수정 컨트롤러
        'workspaceService' : 'components/workspace/workspace.service',  //  업무 공간에 관련된 통신을 담당한다.
        'paymentService' : 'components/payment/payment.service',    //  결재에 관련된 통신을 담당한다.
        'workspaceDepartmentModifyController' : 'app/workspace/workspaceDepartmentModify.controller',  //  사용자 부서 수정 컨트롤러

        /*  사용자 */
        'userRoute' : 'app/user/user',  //  사용자에 관련된 route 정보

 src/main/webapp/views/workspace/departmentModify.html

File was deleted

 src/main/webapp/views/workspace/workspaceDepartmentModify.html

@@ -1,7 +1,7 @@
<div class="formModal" xmlns:cursor="http://www.w3.org/1999/xhtml">
<div class="formModal">
    <div class="modal-header faded smaller">
        <div class="modal-title">
            <strong>부서 수정</strong>
            <strong>부서명 수정</strong>
        </div>
        <button aria-label="Close" class="close" type="button" ng-click="fn.cancel()">
            <span aria-hidden="true"> &times;</span>
@@ -9,24 +9,37 @@
    </div>

    <div class="modal-body">
        <form role="form" name="departmentsModifyForm">
        <form role="form" name="departmentModifyForm">
            <div class="form-group">
                <label><span translate="common.departmentName">부서명</span> </label>
                <js-autocomplete-multi data-input-name="departments"
                                       selected-model="vm.form.departments"
                                       search="vm.departmentName"
                                       source="fn.getUserDepartmentList(vm.departmentName, vm.form.departments)"
                                       input-disabled="false"
                                       translation-texts="{ count : 'common.userNum', empty : 'common.emptyUser' }"
                                       extra-settings="{ displayProp : 'byName' , idProp : 'id', imageable : false, maxlength : 100, autoResize : true }"></js-autocomplete-multi>
                <label for="departmentModifyForm1">
                    <span translate="common.departmentName">부서명</span>
                    <code class="highlighter-rouge">*</code>
                </label>
                <input id="departmentModifyForm1"
                       name="name"
                       type="text"
                       class="form-control"
                       autofocus
                       kr-input
                       input-regex="[^a-zA-Z0-9 가-힣ㄱ-ㅎㅏ-ㅣ\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
                       autocomplete="off"
                       ng-model="vm.form.departmentName"
                       ng-maxlength="200"
                       maxlength="200"
                       required>
                <!--<small translate="notice.enterSpecialCharacters">제목에는 특수 문자를 입력할 수 없습니다.</small>-->
            </div>


                <div class="select3-selection__choicediv mt-10">
                    <span class="select3-selection__choice" ng-repeat="department in vm.form.departments">
                        <span>{{department.byName}}</span> <!--사용자가 속해 있는 부서 이름 출력-->
                        <span class="select3-selection__choice__remove" ng-click="fn.removeDepartments($index)">×</span>
                    </span>
                </div>
            <div class="form-group">
                <label>
                    <span translate="manageDepartment.departmentEx">부서 설명</span>
                </label>
                <summernote
                        class="summernote"
                        lang="ko-KR"
                        config="vm.options"
                        ng-model="vm.form.departmentDescription"
                        target=".note-editable"></summernote>
            </div>
        </form>
    </div>
@@ -35,9 +48,9 @@
        <button type="button" class="btn btn-md btn-grey" ng-click="fn.cancel()"><span translate="common.cancel">취소</span></button>
        <button type="button" class="btn btn-md btn-primary bold"
                js-short-cut
                js-short-cut-action="(fn.formCheck(departmentsModifyForm.$invalid) || $root.spinner) ? null : fn.formSubmit()"
                ng-disabled="fn.formCheck(departmentsModifyForm.$invalid)"
                js-short-cut-action="(fn.formCheck(departmentModifyForm.$invalid) || $root.spinner) ? null : fn.formSubmit()"
                ng-disabled="fn.formCheck(departmentModifyForm.$invalid)"
                ng-click="fn.formSubmit()"><span translate="common.save">저장</span>
        </button>
    </div>
</div>
</div>

 src/main/webapp/views/workspace/workspaceUserDepartmentModify.html

New file
@@ -0,0 +1,43 @@
<div class="formModal" xmlns:cursor="http://www.w3.org/1999/xhtml">
    <div class="modal-header faded smaller">
        <div class="modal-title">
            <strong>부서 수정</strong>
        </div>
        <button aria-label="Close" class="close" type="button" ng-click="fn.cancel()">
            <span aria-hidden="true"> &times;</span>
        </button>
    </div>

    <div class="modal-body">
        <form role="form" name="departmentsModifyForm">
            <div class="form-group">
                <label><span translate="common.departmentName">부서명</span> </label>
                <js-autocomplete-multi data-input-name="departments"
                                       selected-model="vm.form.departments"
                                       search="vm.departmentName"
                                       source="fn.getUserDepartmentList(vm.departmentName, vm.form.departments)"
                                       input-disabled="false"
                                       translation-texts="{ count : 'common.userNum', empty : 'common.emptyUser' }"
                                       extra-settings="{ displayProp : 'byName' , idProp : 'id', imageable : false, maxlength : 100, autoResize : true }"></js-autocomplete-multi>


                <div class="select3-selection__choicediv mt-10">
                    <span class="select3-selection__choice" ng-repeat="department in vm.form.departments">
                        <span>{{department.byName}}</span> <!--사용자가 속해 있는 부서 이름 출력-->
                        <span class="select3-selection__choice__remove" ng-click="fn.removeDepartments($index)">×</span>
                    </span>
                </div>
            </div>
        </form>
    </div>

    <div class="modal-footer buttons-on-right">
        <button type="button" class="btn btn-md btn-grey" ng-click="fn.cancel()"><span translate="common.cancel">취소</span></button>
        <button type="button" class="btn btn-md btn-primary bold"
                js-short-cut
                js-short-cut-action="(fn.formCheck(departmentsModifyForm.$invalid) || $root.spinner) ? null : fn.formSubmit()"
                ng-disabled="fn.formCheck(departmentsModifyForm.$invalid)"
                ng-click="fn.formSubmit()"><span translate="common.save">저장</span>
        </button>
    </div>
</div>