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

jhjang

2022-01-06 226cb2b20e1bfe13205c1890ebf0ffb49ee37d68

 src/main/webapp/scripts/app/project/projectModify.controller.js

@@ -18,6 +18,7 @@
                    detail : detail,    //  상세 정보 조회
                    removeUsr : removeUsr,  //  일반 사용자 제거
                    removeManager : removeManager,  //  관리자 제거
                    removeDepartment : removeDepartment,  //  부서 제거
                    getManagerListCallBack : getManagerListCallBack, //  관리자 auto complete callback function
                    getProjectListCallBack : getProjectListCallBack //  프로젝트 auto complete callback function
                };
@@ -38,10 +39,12 @@
                        description : "",
                        managers : [],  //  관리자
                        users : [], //  일반 사용자
                        departments : [], //  부서
                        startEndDateRange : ""
                    },
                    managerName : "",   //  관리자 이름 검색
                    userName : "",  //  일반 사용자 이름 검색
                    departmentName : "",  // 부서 이름 검색
                    projectName : "",   //  상위 프로젝트 이름 검색
                    autoCompletePage : {
                        manager : {
@@ -72,6 +75,11 @@
                    $scope.vm.form.users.splice(index, 1);
                }

                //  담당부서 삭제
                function removeDepartment(index) {
                    $scope.vm.form.departments.splice(index, 1);
                }

                //  관리자 삭제
                function removeManager(index) {
                    $scope.vm.form.managers.splice(index, 1);
@@ -92,15 +100,9 @@
                        return true;
                    }

                    if ($scope.vm.form.startEndDateRange == "") {
                        return true;
                    }

                    if ($scope.vm.form.managers.length < 1) {
                        return true;
                    }



                    return false;
                }
@@ -110,7 +112,7 @@

                    var content = {
                        id : $scope.vm.form.id,
                        parentProjectId : $scope.vm.projectName.length > 0 && $scope.vm.projectName == $scope.vm.form.parentProjects[0].name ? $scope.vm.form.parentProjects[0].id : null,
                        //parentProjectId : $scope.vm.projectName.length > 0 && $scope.vm.projectName == $scope.vm.form.parentProjects[0].name ? $scope.vm.form.parentProjects[0].id : null,
                        name : $rootScope.preventXss($scope.vm.form.name),
                        status : $scope.vm.form.status,
                        startDate : "",
@@ -129,12 +131,24 @@
                                userIds.push(user.id);
                            });
                            return userIds;
                        })()
                        })(),
                        departmentIds : (function () {
                            var departmentIds = [];
                            angular.forEach($scope.vm.form.departments, function (department) {
                                departmentIds.push(department.id);
                            });
                            return departmentIds;
                        })(),
                    };

                    var startEndDateRange = $scope.vm.form.startEndDateRange.split("~");
                    content.startDate = startEndDateRange[0].trim();
                    content.endDate = startEndDateRange[1].trim();
                    if ($scope.vm.form.startEndDateRange === null || $scope.vm.form.startEndDateRange === "") {
                        content.startDate = "";
                        content.endDate = "";
                    } else {
                        var startEndDateRange = $scope.vm.form.startEndDateRange.split("~");
                        content.startDate = startEndDateRange[0].trim();
                        content.endDate = startEndDateRange[1].trim();
                    }

                    Project.modify($resourceProvider.getContent(
                        content,
@@ -168,10 +182,15 @@
                            if (angular.isDefined(result.data.data)) {
                                $scope.vm.form.name = result.data.data.name;
                                $scope.vm.form.status = result.data.data.status;
                                $scope.vm.form.startEndDateRange = result.data.data.startDate + " ~ " + result.data.data.endDate;
                                if (result.data.data.startDate == "" && result.data.data.endDate == "" || result.data.data.startDate == "null" && result.data.data.endDate == "null") {
                                    $scope.vm.form.startEndDateRange = ""
                                } else {
                                    $scope.vm.form.startEndDateRange = result.data.data.startDate + " ~ " + result.data.data.endDate;
                                }
                                $scope.vm.form.description = result.data.data.description;
                                $scope.vm.form.managers = result.data.data.projectManagerVos;
                                $scope.vm.form.users = result.data.data.projectUserVos;
                                $scope.vm.form.departments = result.data.data.projectDepartmentVos;

                                if (result.data.data.parentProjectVo != null) {
                                    $scope.vm.form.parentProjects = [];