이슈 히스토리 하위이슈 문구 중복되는 문제 해결

이민희

2021-12-20 9ea4a2d0385d48a0713a5bbc3c1a8967e10baae1

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

@@ -81,6 +81,7 @@
                $scope.vm.form = {
                    issues : [], //연관 일감
                    issuesDown : [],  // 하위 일감
                    issuesDownStatus : [], //하위 이슈 상태
                    issueCompanyVos : [],
                    issueIspVos : [],
                    issueHostingVos : []
@@ -700,7 +701,8 @@
                            parameter : function () {
                                return {
                                    issueIds : [$scope.vm.viewer.id],
                                    projectId : $scope.vm.viewer.projectVo.id
                                    projectId : $scope.vm.viewer.projectVo.id,
                                    downIssuesStatus : $scope.vm.form.issuesDownStatus
                                };
                            }
                        }
@@ -881,6 +883,7 @@
                                $scope.vm.form.issues = [];
                                $scope.vm.form.issues.push(result.data.data);
                                $scope.vm.form.issuesDown = [];
                                $scope.vm.form.issuesDownStatus = [];// 하위이슈 상태
                                $scope.vm.form.issuesDown.push(result.data.data);

                                var issueTableConfigVos = result.data.data.issueTableConfigVos;
@@ -900,7 +903,7 @@
                                    angular.forEach(result.data.data.issueDownVos, function (issueDownVo){
                                        //$scope.vm.form.issuesDown.push(issueDownVo.issueDown);
                                        $scope.vm.form.issuesDown.push(issueDownVo);

                                        $scope.vm.form.issuesDownStatus.push(issueDownVo.issueStatusVo.issueStatusType);
                                    });
                                }
                                $scope.vm.viewer.issueRelationVos = result.data.data.issueRelationVos;
@@ -909,6 +912,7 @@
                                if ($rootScope.workProject.id > -1 && result.data.data.projectVo !== null) {
                                    $rootScope.changeLastProject(result.data.data.projectVo.id);
                                }

                            }
                        }
                        else {
@@ -991,8 +995,54 @@

                //  활동 이력 만들기
                function makeActiveHistory() {
                    $scope.vm.viewer.activeHistory = $scope.vm.viewer.issueCommentVos.concat($scope.vm.viewer.issueHistoryVos);
                    $scope.vm.viewer.activeHistory.sort(function (a, b) {
                    if ($scope.vm.viewer.issueDownVos != null && $scope.vm.viewer.issueDownVos.length > 0) {
                        $scope.vm.viewer.activeHistory = "";
                        $scope.vm.viewer.activeParentHistory = "";
                        $scope.vm.viewer.activeDownHistory = "";
                        $scope.vm.viewer.activeDownAllHistory = "";
                        var downTitle = "";
                        // 하위이슈 히스토리
                        for (var i=0; i<$scope.vm.viewer.issueDownVos.length; i++){
                            if($scope.vm.viewer.issueDownVos.length > 1){
                                $scope.vm.viewer.activeDownHistory = $scope.vm.viewer.issueDownVos[i].issueHistoryVos.concat($scope.vm.viewer.issueDownVos[i+1].issueHistoryVos);
                                i++;
                            }else {
                                $scope.vm.viewer.activeDownHistory = $scope.vm.viewer.issueDownVos[i].issueHistoryVos;
                            }
                        }
                        for (var i=0; i<$scope.vm.viewer.activeDownHistory.length; i++){
                            downTitle = "<div class='dot' style='margin-bottom: -8px'>*하위이슈 : "+$scope.vm.viewer.activeDownHistory[i].title+"</div>";
                            $scope.vm.viewer.activeDownHistory[i].desc = downTitle + $scope.vm.viewer.activeDownHistory[i].description;
                        }
                        $scope.vm.viewer.activeDownHistory.sort(function (a, b) {   //내림차순
                            return a.registerDate > b.registerDate ? -1 : a.registerDate < b.registerDate ? 1 : 0;
                        });

                        // 하위이슈 댓글 히스토리
                       for (var i=0; i<$scope.vm.viewer.issueDownVos.length; i++) {
                           if($scope.vm.viewer.issueDownVos.length > 1){
                                $scope.vm.viewer.downComment = $scope.vm.viewer.issueDownVos[i].issueCommentVos.concat($scope.vm.viewer.issueDownVos[i+1].issueCommentVos);
                                i++;
                           } else {
                                $scope.vm.viewer.downComment = $scope.vm.viewer.issueDownVos[i].issueCommentVos;
                           }
                       }
                       $scope.vm.viewer.issueDownVos.sort(function (a, b) {   //내림차순
                           return a.registerDate > b.registerDate ? -1 : a.registerDate < b.registerDate ? 1 : 0;
                       });

                       $scope.vm.viewer.activeDownAllHistory = $scope.vm.viewer.downComment.concat($scope.vm.viewer.activeDownHistory);
                       $scope.vm.viewer.activeParentHistory = $scope.vm.viewer.issueCommentVos.concat($scope.vm.viewer.issueHistoryVos);
                       $scope.vm.viewer.activeHistory = $scope.vm.viewer.activeParentHistory.concat($scope.vm.viewer.activeDownAllHistory);

                    }else {
                        $scope.vm.viewer.activeParentHistory = $scope.vm.viewer.issueCommentVos.concat($scope.vm.viewer.issueHistoryVos);
                        $scope.vm.viewer.activeHistory = $scope.vm.viewer.issueCommentVos.concat($scope.vm.viewer.issueHistoryVos);
                    }
                    $scope.vm.viewer.activeParentHistory.sort(function (a, b) {   //내림차순
                        return a.registerDate > b.registerDate ? -1 : a.registerDate < b.registerDate ? 1 : 0;
                    });
                    $scope.vm.viewer.activeHistory.sort(function (a, b) {   //내림차순
                        return a.registerDate > b.registerDate ? -1 : a.registerDate < b.registerDate ? 1 : 0;
                    });
                }
@@ -1046,7 +1096,6 @@
                                        $timeout(function () {
                                            SweetAlert.success($filter("translate")("common.deleteSucceeded"), result.data.message.message); // 삭제 성공
                                        }, 100);

                                        $scope.fn.getCommentList();
                                    }
                                    else {
@@ -1069,6 +1118,7 @@

                        if (result.data.message.status === "success") {
                            $scope.vm.viewer.issueCommentVos = result.data.data;
                            $scope.fn.updateActiveHistory();
                        }
                        else {
                            SweetAlert.swal({