충돌 수정

이민희

2021-12-01 5fb1952ae91f1a739803247266e87dbd15ea1f27

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

@@ -43,6 +43,7 @@
                $scope.fn.getDownTableConfigs = getDownTableConfigs;
                $scope.fn.containsPartner = containsPartner;
                $scope.fn.onActivate = onActivate;
                $scope.fn.makePartnersEmail = makePartnersEmail;

                //  이슈 목록 컨트롤러 vm, fn 상속 중
                $scope.vm.viewer = {};
@@ -72,7 +73,10 @@

                $scope.vm.form = {
                    issues : [], //연관 일감
                    issuesDown : []  // 하위 일감
                    issuesDown : [],  // 하위 일감
                    issueCompanyVos : [],
                    issueIspVos : [],
                    issueHostingVos : []
                };


@@ -636,16 +640,25 @@
                }

                //  이슈명을 클릭하면 이슈 상세 정보를 조회한다.
                $rootScope.$on("getIssueDetail", function (event, args) {
                    $scope.vm.viewer.id = args["id"];
                    $scope.fn.getIssueDetail();
                });
                // $rootScope.$on("getIssueDetail", function (event, args) {
                //     $scope.vm.viewer.id = args["id"];
                //     $scope.fn.getIssueDetail();
                // });

                //  이슈명을 클릭하면 이슈 상세 정보를 조회한다.
                $scope.$on("getIssueDetail", function (event, args) {
                    $scope.vm.viewer.id = args["id"];
                    $scope.fn.getIssueDetail();
                });
                // $scope.$on("getIssueDetail", function (event, args) {
                //     $scope.vm.viewer.id = args["id"];
                //     $scope.fn.getIssueDetail();
                // });

                $scope.$watch(function() {
                    return $rootScope.currentDetailIssueId;
                }, function() {
                    if ($rootScope.currentDetailIssueId != null) {
                        $scope.vm.viewer.id = $rootScope.currentDetailIssueId;
                        $scope.fn.getIssueDetail();
                    }
                }, true);

                //  초기화 해야할 할목을 지정하여 다른 이슈를 클릭할 때 초기화해준다.
                function initReload() {
@@ -653,9 +666,9 @@
                    $scope.vm.issueForm.issueStatusList = [];
                    $scope.vm.issueForm.issueStatusId = "";
                    $scope.vm.issueTypeId = $rootScope.getCurrentIssueTypeId();
                    /*if ($scope.$root.$$phase !== '$apply' && $scope.$root.$$phase !== '$digest') {
                        $scope.$apply();
                    }*/
                    // if ($scope.$root.$$phase !== '$apply' && $scope.$root.$$phase !== '$digest') {
                    //     $scope.$apply();
                    // }
                }

                //  이슈 상태 변경
@@ -804,7 +817,7 @@
                    $scope.fn.getDownTableConfigs();

                        Issue.detail($resourceProvider.getContent(
                        {id : $scope.vm.viewer.id, deep : "02", customFields : $scope.vm.customFields},
                        {id : $scope.vm.viewer.id, deep : "02"},
                        $resourceProvider.getPageContent(0, 1))).then(function (result) {

                        if (result.data.message.status === "success") {
@@ -846,6 +859,10 @@
                                }
                                $scope.vm.viewer.issueRelationVos = result.data.data.issueRelationVos;
                                $scope.vm.viewer.issueDownVos = result.data.data.issueDownVos;

                                if ($rootScope.workProject.id > -1) {
                                    $rootScope.changeLastProject(result.data.data.projectVo.id);
                                }
                            }
                        }
                        else {
@@ -1038,8 +1055,15 @@
                    });
                }

                // 업체/ISP/호스팅 배열값을 하나로 합쳐서 메일 클릭시 전달
                function makePartnersEmail() {
                    $scope.vm.form.partnersEmail = $scope.vm.viewer.issueCompanyVos.concat($scope.vm.viewer.issueIspVos, $scope.vm.viewer.issueHostingVos)
                    return $scope.vm.form.partnersEmail;
                }

                //  특정 사용자에게 이슈를 메일로 발송
                function sendMail(issueId, projectId) {
                    makePartnersEmail();
                    $uibModal.open({
                        templateUrl : 'views/issue/issueSendMail.html',
                        size : "md",
@@ -1049,11 +1073,12 @@
                            parameter : function () {
                                return {
                                    departmentVos : [$scope.vm.form.issues[0].departmentVos],
                                    issueCompanyFields : [$scope.vm.form.issues[0].issueCompanyVos],
                                    issueIspFields : [$scope.vm.form.issues[0].issueIspVos],
                                    issueHostingFields : [$scope.vm.form.issues[0].issueHostingVos],
                                    partners : $scope.vm.form.partnersEmail,
                                    issueId : issueId,
                                    projectId : projectId
                                    // issueCompanyFields : [$scope.vm.viewer.issueCompanyVos[0]],
                                    // issueIspFields : [$scope.vm.viewer.issueIspVos[0]],
                                    // issueHostingFields : [$scope.vm.viewer.issueHostingVos[0]],
                                };
                            }
                        }