Merge remote-tracking branch 'origin/master'

박지현

2022-02-22 1dad4d94cc415d2f8092aff0368744289337f504

 src/main/webapp/scripts/app/issue/issueModify.controller.js

@@ -169,6 +169,9 @@
                    priorities : [],    //  우선순위 정보
                    severities : [],    //  중요도 정보
                    fileTableConfigs : [],   //  파일 업로드 정보 테이블
                    inheritPartners : parameter.inheritPartners,
                    downTotalCount : parameter.downTotalCount,
                    usePartner : parameter.usePartner,
                };

                // 연관 일감 관련
@@ -404,7 +407,16 @@
                }

                // 업체 카테고리 autocomplete page 업데이트
                function getParentSectorListCallBack(result) {
                function getParentSectorListCallBack(result, value) {
                    if (value === "") {
                        $scope.vm.form.parentSectorId = "";
                        if ($rootScope.isDefined($scope.vm.form.parentSectors) && $rootScope.isDefined($scope.vm.form.parentSectors[0])) {
                            $scope.vm.form.parentSectors[0].id = "";
                        }
                        $scope.vm.form.childSectorId = "";
                        $scope.vm.form.childSector = "";
                        $scope.vm.form.childSectors = [];
                    }
                    $scope.vm.autoCompletePage.parentSector.totalPage = result.data.page.totalPage;
                }

@@ -443,6 +455,11 @@
                $scope.$on("parentSectorEvent", function (event, result) {
                    if ($rootScope.isDefined(result) && $rootScope.isDefined(result[0])) {
                        $scope.vm.form.parentSectorId = result[0].id;
                    }  else {
                        $scope.vm.form.parentSectorId = "";
                        if ($rootScope.isDefined($scope.vm.form.parentSectors) && $rootScope.isDefined($scope.vm.form.parentSectors[0])) {
                            $scope.vm.form.parentSectors[0].id = "";
                        }
                    }
                    $scope.vm.form.childSectorId = "";
                    $scope.vm.form.childSector = "";
@@ -561,11 +578,13 @@

                function formSubmit() {
                    $rootScope.spinner = true;
                    let inheritYn = false;

                    var content = {
                        id : parameter.id,
                        title : $rootScope.preventXss($scope.vm.form.title),    //  제목
                        description : $rootScope.preventXss($scope.vm.form.description),   //  내용
                        inheritYn : inheritYn,
                        companyName : $scope.vm.companyName,
                        companyManager : $scope.vm.companyManager,
                        companyTel : $scope.vm.companyTel,
@@ -734,7 +753,8 @@
                                    parentSectorId : $scope.vm.form.parentSectorId,
                                    childSectorId : $scope.vm.form.childSectorId,
                                    regionId : $scope.vm.form.regionId,
                                    statusId : $scope.vm.form.statusId
                                    statusId : $scope.vm.form.statusId,
                                    statusName : $scope.vm.form.status
                                });
                            }

@@ -824,42 +844,101 @@
                        })()
                    };

                    Issue.modify({
                        method : "POST",
                        file : (function () {
                            var files = [];

                            angular.forEach($scope.vm.form.files, function (file) {
                                if (angular.isUndefined(file.id)) {
                                    files.push(file);
                                }
                            });

                            return files;
                        })(),
                        //      data 속성으로 별도의 데이터 전송
                        fields : {
                            content : content
                    if ($rootScope.isDefined($scope.vm.usePartner) && $scope.vm.usePartner.length > 0
                            && $rootScope.isDefined($scope.vm.inheritPartners) && $scope.vm.inheritPartners
                            && $rootScope.isDefined($scope.vm.downTotalCount) && $scope.vm.downTotalCount > 0) {
                        SweetAlert.swal({
                            title : $filter("translate")("issue.modifyIssues"), // 이슈 변경
                            text : $filter("translate")("issue.wantToInheritPartnersOfIssue"), // 현재 이슈의 파트너 정보(업체/ISP/호스팅)를 모든 하위이슈에 일괄 적용시키겠습니까?
                            type : "warning",
                            showCancelButton : true,
                            confirmButtonColor : "#DD6B55",
                            confirmButtonText : $filter("translate")("common.ok"), // 네
                            cancelButtonText : $filter("translate")("common.no"), // 아니오
                            closeOnConfirm : false,
                            closeOnCancel : false
                        },
                        fileFormDataName : "file"
                    }).then(function (result) {
                        function (isConfirm) {
                            if (isConfirm) {
                                inheritYn = true;
                                content.inheritYn = true;
                            }

                        if (result.data.message.status === "success") {
                            $scope.fn.cancel();
                            Issue.modify({
                                method : "POST",
                                file : (function () {
                                    var files = [];

                            //  이슈 상세 화면 요청
                            $rootScope.$broadcast("getIssueDetail", {
                                id : parameter.id
                                    angular.forEach($scope.vm.form.files, function (file) {
                                        if (angular.isUndefined(file.id)) {
                                            files.push(file);
                                        }
                                    });

                                    return files;
                                })(),
                                //      data 속성으로 별도의 데이터 전송
                                fields : {
                                    content : content
                                },
                                fileFormDataName : "file"
                            }).then(function (result) {

                                if (result.data.message.status === "success") {
                                    $scope.fn.cancel();

                                    //  이슈 상세 화면 요청
                                    $rootScope.$broadcast("getIssueDetail", {
                                        id : parameter.id
                                    });

                                    $rootScope.$broadcast("getIssueList");
                                }
                                else {
                                    SweetAlert.error($filter("translate")("issue.failedIssueModify"), result.data.message.message); // 이슈 수정 실패
                                }

                                $rootScope.spinner = false;
                            });
                        });
                    } else {
                        Issue.modify({
                            method : "POST",
                            file : (function () {
                                var files = [];

                            $rootScope.$broadcast("getIssueList");
                        }
                        else {
                            SweetAlert.error($filter("translate")("issue.failedIssueModify"), result.data.message.message); // 이슈 수정 실패
                        }
                                angular.forEach($scope.vm.form.files, function (file) {
                                    if (angular.isUndefined(file.id)) {
                                        files.push(file);
                                    }
                                });

                        $rootScope.spinner = false;
                    });
                                return files;
                            })(),
                            //      data 속성으로 별도의 데이터 전송
                            fields : {
                                content : content
                            },
                            fileFormDataName : "file"
                        }).then(function (result) {

                            if (result.data.message.status === "success") {
                                $scope.fn.cancel();

                                //  이슈 상세 화면 요청
                                $rootScope.$broadcast("getIssueDetail", {
                                    id : parameter.id
                                });

                                $rootScope.$broadcast("getIssueList");
                            }
                            else {
                                SweetAlert.error($filter("translate")("issue.failedIssueModify"), result.data.message.message); // 이슈 수정 실패
                            }

                            $rootScope.spinner = false;
                        });
                    }
                }

                function cancel() {