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

이민희

2021-12-20 9ea4a2d0385d48a0713a5bbc3c1a8967e10baae1

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

 src/main/webapp/assets/styles/main.css

@@ -19409,7 +19409,7 @@
    -ms-flex-align: center;
    /*align-items: center;*/
    padding: 15px;
    border-bottom: 1px solid rgba(0, 0, 0, 0.05);
    border-bottom: 1px solid rgba(0, 0, 0, 0.3);
    position: relative;

}
@@ -19473,7 +19473,7 @@
.aei-content .aei-delete {
    position: absolute;
    top: 0px;
    right: -10px;
    right: 12px;
    color: rgba(0, 0, 0, 0.7);
    font-size: 0.5rem;
    cursor: pointer;
@@ -28591,6 +28591,10 @@
    margin-left: 30px !important;
}

.ml-3per {
    margin-left: 3.3%;
}


.m-0 {
    margin: 0 auto !important;
@@ -29048,9 +29052,10 @@
}

.dot {
    color: #161617;
    color: #15158a;
    font-size: 0.9rem;
    font-weight: bold;
    margin-bottom: -15px;
}

.activity-text h6.creat .dot {

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

@@ -990,7 +990,7 @@
``
                function updateActiveHistory() {
                    $scope.vm.activeTab = 'ALL';
                    //$scope.fn.makeActiveHistory();
                    $scope.fn.makeActiveHistory();
                }

                //  활동 이력 만들기
@@ -1000,14 +1000,19 @@
                        $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++){
                            $scope.vm.viewer.activeDownHistory = $scope.vm.viewer.issueDownVos[i].issueHistoryVos.concat($scope.vm.viewer.issueDownVos[i+1].issueHistoryVos);
                            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++){
                            $scope.vm.viewer.activeDownHistory[i].description
                                = "<div class='dot'>하위이슈 : "+$scope.vm.viewer.activeDownHistory[i].title+"</div>" + $scope.vm.viewer.activeDownHistory[i].description;
                            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;
@@ -1015,13 +1020,13 @@

                        // 하위이슈 댓글 히스토리
                       for (var i=0; i<$scope.vm.viewer.issueDownVos.length; i++) {
                            $scope.vm.viewer.downComment = $scope.vm.viewer.issueDownVos[i].issueCommentVos.concat($scope.vm.viewer.issueDownVos[i+1].issueCommentVos);
                            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;
                           }
                       }
                       /*for (var i=0; i<$scope.vm.viewer.downComment.length; i++){
                           $scope.vm.viewer.downComment[i].description
                               = $scope.vm.viewer.downComment[i].title +"의 댓글 : "+ $scope.vm.viewer.downComment[i].description;
                       }*/
                       $scope.vm.viewer.issueDownVos.sort(function (a, b) {   //내림차순
                           return a.registerDate > b.registerDate ? -1 : a.registerDate < b.registerDate ? 1 : 0;
                       });
@@ -1031,8 +1036,12 @@
                       $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;
                    });
@@ -1087,7 +1096,6 @@
                                        $timeout(function () {
                                            SweetAlert.success($filter("translate")("common.deleteSucceeded"), result.data.message.message); // 삭제 성공
                                        }, 100);

                                        $scope.fn.getCommentList();
                                    }
                                    else {

 src/main/webapp/views/issue/issueDetail.html

@@ -699,40 +699,45 @@
                                            <!--<h6 ng-if="activeHistory.issueHistoryType == 'TOTAL'"
                                                translate="issue.summaryIssueActivity">이슈 활동 내역 요약 <i
                                                    class="os-icon os-icon-arrow-down"></i></h6>-->
                                            <div dom-append dom="activeHistory.description"></div>
                                            <div ng-if="!$root.isDefined(activeHistory.desc)" dom-append dom="activeHistory.description"></div>
                                            <div ng-if="$root.isDefined(activeHistory.desc)" dom-append dom="activeHistory.desc"></div>
                                        </div>
                                        <!--    댓글인 경우  -->
                                        <div ng-if="!$root.isDefined(activeHistory.issueHistoryType)"
                                             ng-show="vm.viewer.title !== activeHistory.title">
                                            <span class="dot">
                                                하위이슈 : {{::activeHistory.title}}
                                                *하위이슈 : {{::activeHistory.title}}
                                            </span>
                                        </div>
                                            <div class="aei-image" style="position: absolute; top: 30%" ng-if="!$root.isDefined(activeHistory.issueHistoryType)">
                                                <div class="user-avatar-w">
                                                    <img alt="image" ng-src="{{::activeHistory.profile}}">
                                                </div>
                                        <div class="aei-image" style="position: absolute; top: 30%" ng-if="!$root.isDefined(activeHistory.issueHistoryType)">
                                            <div class="user-avatar-w">
                                                <img ng-show="vm.viewer.title !== activeHistory.title"
                                                    style="margin-top: 15px" alt="image" ng-src="{{::activeHistory.profile}}">
                                                <img ng-show="vm.viewer.title === activeHistory.title"
                                                     alt="image" ng-src="{{::activeHistory.profile}}">
                                            </div>


                                        </div>
                                        <div class="aei-content"
                                             ng-if="!$root.isDefined(activeHistory.issueHistoryType)">
                                            <h6 class="aei-title mt-1" style="margin-left: 3.3%">
                                            <h6 class="aei-title mt-1 ml-3per">
                                                {{::activeHistory.registerName}}
                                            </h6>
                                            <div class="date-break mt-2" style="margin-left: 3.3%">
                                            <div class="date-break mt-2 ml-3per">
                                                <span>{{::activeHistory.registerDate}}</span>
                                            </div>
                                            <div class="aei-delete"
                                                 ng-click="fn.removeComment(comment)"
                                                 ng-show="$root.user.id == comment.registerId">
                                                 ng-click="fn.removeComment(activeHistory)"
                                                 ng-show="vm.viewer.modifyPermissionCheck || $root.user.id === activeHistory.registerId">
                                                <i class="os-icon os-icon-close"></i>
                                            </div>
                                            <div class="chat-messages">
                                                <div class="message" style="margin-left: 3.3%">
                                                <div class="message ml-3per">
                                                    <div class="message-content">
                                                        <span class="issue-detail-word-break">{{::activeHistory.description}}</span>
                                                    </div>
                                                    <!--<div class="message-content" ng-if="activeHistory.desc === null">
                                                        <span class="issue-detail-word-break">{{::activeHistory.desc}}</span>
                                                    </div>-->
                                                </div>

                                            </div>
@@ -761,7 +766,7 @@
                                            </div>
                                            <div class="aei-delete"
                                                 ng-click="fn.removeComment(comment)"
                                                 ng-show="$root.user.id == comment.registerId">
                                                 ng-show="vm.viewer.modifyPermissionCheck || $root.user.id == comment.registerId">
                                                <i class="os-icon os-icon-close"></i>
                                            </div>
                                            <div class="chat-messages">
@@ -781,7 +786,7 @@
                                        기록이 없습니다.
                                    </div>

                                    <div class="ae-item row" ng-repeat="issueHistory in vm.viewer.activeParentHistory">
                                    <div class="ae-item" ng-repeat="issueHistory in vm.viewer.activeParentHistory">
                                        <!--<h6 ng-if="issueHistory.issueHistoryType == 'TOTAL'"
                                            translate="issue.summaryIssueActivity">이슈 활동 내역 요약
                                            <i class="os-icon os-icon-arrow-down"></i>
@@ -797,19 +802,19 @@
                                        </div>
                                        <div class="aei-content"
                                             ng-if="!$root.isDefined(issueHistory.issueHistoryType)">
                                            <h6 class="aei-title mt-1" style="margin-left: 3.3%">
                                            <h6 class="aei-title mt-1 ml-3per">
                                                {{::issueHistory.registerName}}
                                            </h6>
                                            <div class="date-break mt-2" style="margin-left: 3.3%">
                                            <div class="date-break mt-2 ml-3per">
                                                <span>{{::issueHistory.registerDate}}</span>
                                            </div>
                                            <div class="aei-delete"
                                                 ng-click="fn.removeComment(comment)"
                                                 ng-show="$root.user.id == comment.registerId">
                                                 ng-click="fn.removeComment(issueHistory)"
                                                 ng-show="vm.viewer.modifyPermissionCheck || $root.user.id == issueHistory.registerId">
                                                <i class="os-icon os-icon-close"></i>
                                            </div>
                                            <div class="chat-messages">
                                                <div class="message" style="margin-left: 3.3%">
                                                <div class="message ml-3per">
                                                    <div class="message-content">
                                                        <span class="issue-detail-word-break">{{::issueHistory.description}}</span>
                                                    </div>
@@ -826,29 +831,29 @@
                                    <div class="ae-item row" ng-repeat="issueDownHistory in vm.viewer.activeDownAllHistory">
                                        <!--    기록인 경우  -->
                                        <div class="aei-content" ng-if="$root.isDefined(issueDownHistory.issueHistoryType)">
                                            <div dom-append dom="issueDownHistory.description"></div>
                                            <div dom-append dom="issueDownHistory.desc"></div>
                                        </div>
                                        <!--    댓글인 경우  -->
                                        <div class="aei-content" ng-if="!$root.isDefined(issueDownHistory.issueHistoryType)">
                                        <div class="aei-content pb-3" ng-if="!$root.isDefined(issueDownHistory.issueHistoryType)">
                                            <div class="dot">
                                                하위이슈 : {{::issueDownHistory.title}}
                                                *하위이슈 : {{::issueDownHistory.title}}
                                            </div>
                                        </div>
                                        <div class="aei-image" style="position: absolute; top: 30%" ng-if="!$root.isDefined(issueDownHistory.issueHistoryType)">
                                            <div class="user-avatar-w ">
                                                <img alt="image" ng-src="{{::issueDownHistory.profile}}">
                                                <img style="margin-top: 15px" alt="image" ng-src="{{::issueDownHistory.profile}}">
                                            </div>
                                        </div>
                                        <div class="aei-content" ng-if="!$root.isDefined(issueDownHistory.issueHistoryType)">
                                            <h6 class="aei-title mt-1" style="margin-left: 3.3%">
                                            <h6 class="aei-title mt-1 ml-3per">
                                                {{::issueDownHistory.registerName}}
                                            </h6>
                                            <div class="date-break mt-2" style="margin-left: 3.3%">
                                                <span>{{::issueDownHistory.registerDate}}</span>
                                            </div>
                                            <div class="aei-delete"
                                                 ng-click="fn.removeComment(comment)"
                                                 ng-show="$root.user.id == comment.registerId">
                                                 ng-click="fn.removeComment(issueDownHistory)"
                                                 ng-show="vm.viewer.modifyPermissionCheck || $root.user.id == issueDownHistory.registerId">
                                                <i class="os-icon os-icon-close"></i>
                                            </div>
                                            <div class="chat-messages">
@@ -888,7 +893,7 @@
                                            </div>
                                            <div class="aei-delete"
                                                 ng-click="fn.removeComment(comment)"
                                                 ng-show="$root.user.id == comment.registerId">
                                                 ng-show="vm.viewer.modifyPermissionCheck || $root.user.id == comment.registerId">
                                                <i class="os-icon os-icon-close"></i>
                                            </div>
                                            <div class="chat-messages">