From 145928e42a8ae18129fcbc720824a9e4f78999bd Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 17 12월 2021 17:23:03 +0900
Subject: [PATCH] 상위이슈의 상세페이지에서 하위이슈에 대한 활동내역 보여주기
---
src/main/webapp/views/issue/issueDetail.html | 196 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 159 insertions(+), 37 deletions(-)
diff --git a/src/main/webapp/views/issue/issueDetail.html b/src/main/webapp/views/issue/issueDetail.html
index 3e26ae3..6afd634 100644
--- a/src/main/webapp/views/issue/issueDetail.html
+++ b/src/main/webapp/views/issue/issueDetail.html
@@ -631,6 +631,32 @@
<span translate="common.noAttachedFile">泥⑤��맂 �뙆�씪�씠 �뾾�뒿�땲�떎.</span>
</div>
</div>
+ <div class="row">
+ <div class="col-sm-12">
+ <h6 class="todo-content-subheader mt-20" translate="common.writeComment">�뙎湲� �벐湲�</h6>
+ <form name="commentForm" ng-enter="fn.addComment()">
+ <div class="form-group row ">
+ <div class="col-sm-12">
+ <div class="input-group">
+ <input class="form-control"
+ kr-input
+ maxlength="300"
+ placeholder="{{'common.pleaseEnterComments' | translate}}"
+ ng-model="vm.viewer.comment"
+ type="text">
+ <div class="input-group-prepend">
+ <div class="input-group-text2"
+ ng-class="{ 'disable' : !$root.isDefined(vm.viewer.comment) }"
+ ng-click="fn.addComment()">
+ <i class="os-icon os-icon-mail-18"></i>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
<!-- �솢�룞 �궡�뿭 -->
<div class="row">
@@ -644,14 +670,22 @@
ng-click="fn.updateActiveHistory()"><span
translate="common.fullView">�쟾泥대낫湲�</span></a>
</li>
- <li class="nav-item cursor">
+ <!--<li class="nav-item cursor">
<a class="nav-link" ng-class="{ 'active' : vm.activeTab == 'REPLY' }"
ng-click="vm.activeTab = 'REPLY'"><span translate="common.comments">�뙎湲�</span></a>
- </li>
+ </li>-->
<li class="nav-item cursor">
<a class="nav-link" ng-class="{ 'active' : vm.activeTab == 'RECODE' }"
ng-click="vm.activeTab = 'RECODE'"><span translate="common.record">湲곕줉</span></a>
</li>
+ <li class="nav-item cursor">
+ <a class="nav-link" ng-class="{ 'active' : vm.activeTab == 'RECODE_DOWN' }"
+ ng-click="vm.activeTab = 'RECODE_DOWN'"><span translate="common.recordDown">�븯�쐞�씠�뒋 湲곕줉</span></a>
+ </li>
+ <!--<li class="nav-item cursor">
+ <a class="nav-link" ng-class="{ 'active' : vm.activeTab == 'REPLY_DOWN' }"
+ ng-click="vm.activeTab = 'REPLY_DOWN'"><span translate="common.downComments">�븯�쐞�씠�뒋 �뙎湲�</span></a>
+ </li>-->
</ul>
</div>
@@ -662,12 +696,18 @@
<!-- 湲곕줉�씤 寃쎌슦 -->
<div class="aei-content"
ng-if="$root.isDefined(activeHistory.issueHistoryType)">
- <h6 ng-if="activeHistory.issueHistoryType == 'TOTAL'"
+ <!--<h6 ng-if="activeHistory.issueHistoryType == 'TOTAL'"
translate="issue.summaryIssueActivity">�씠�뒋 �솢�룞 �궡�뿭 �슂�빟 <i
- class="os-icon os-icon-arrow-down"></i></h6>
+ class="os-icon os-icon-arrow-down"></i></h6>-->
<div dom-append dom="activeHistory.description"></div>
</div>
<!-- �뙎湲��씤 寃쎌슦 -->
+ <div ng-if="!$root.isDefined(activeHistory.issueHistoryType)"
+ ng-show="vm.viewer.title !== activeHistory.title">
+ <div>
+ �븯�쐞�씠�뒋 : {{::activeHistory.title}}
+ </div>
+ </div>
<div class="aei-image" ng-if="!$root.isDefined(activeHistory.issueHistoryType)">
<div class="user-avatar-w">
<img alt="image" ng-src="{{::activeHistory.profile}}">
@@ -728,53 +768,135 @@
<span class="issue-detail-word-break">{{::comment.description}}</span>
</div>
</div>
-
</div>
</div>
</div>
- <form name="commentForm" ng-enter="fn.addComment()">
- <div class="form-group row ">
- <div class="col-sm-12">
- <div class="input-group">
- <input class="form-control"
- kr-input
- maxlength="300"
- placeholder="{{'common.pleaseEnterComments' | translate}}"
- ng-model="vm.viewer.comment"
- type="text">
- <div class="input-group-prepend">
- <div class="input-group-text2"
- ng-class="{ 'disable' : !$root.isDefined(vm.viewer.comment) }"
- ng-click="fn.addComment()">
- <i class="os-icon os-icon-mail-18"></i>
- </div>
- </div>
- </div>
- </div>
- </div>
- </form>
</div>
<!-- 湲곕줉 蹂닿린 -->
<div ng-if="vm.activeTab == 'RECODE'">
- <div class="no-cont2"
- ng-if="vm.viewer.issueHistoryVos.length < 1"
- translate="common.noRecord">
+ <div class="no-cont2" ng-if="vm.viewer.activeParentHistory.length < 1" translate="common.noRecord">
湲곕줉�씠 �뾾�뒿�땲�떎.
</div>
- <!--<div>
- {{vm.viewer.issueHistoryVos}}
- </div>-->
- <div class="activity-item"
- ng-repeat="issueHistory in vm.viewer.issueHistoryVos">
- <h6 ng-if="issueHistory.issueHistoryType == 'TOTAL'"
+ <div class="activity-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>
- </h6>
- <div class="activity-content">
+ </h6>-->
+ <div class="activity-content" ng-if="$root.isDefined(issueHistory.issueHistoryType)">
<div dom-append dom="issueHistory.description"></div>
</div>
+ <!-- �뙎湲��씤 寃쎌슦 -->
+ <div class="aei-image" ng-if="!$root.isDefined(issueHistory.issueHistoryType)">
+ <div class="user-avatar-w">
+ <img alt="image" ng-src="{{::issueHistory.profile}}">
+ </div>
+ </div>
+ <div class="aei-content"
+ ng-if="!$root.isDefined(issueHistory.issueHistoryType)">
+ <h6 class="aei-title">
+ {{::issueHistory.registerName}}
+ </h6>
+ <div class="date-break">
+ <span>{{::issueHistory.registerDate}}</span>
+ </div>
+ <div class="aei-delete"
+ ng-click="fn.removeComment(comment)"
+ ng-show="$root.user.id == comment.registerId">
+ <i class="os-icon os-icon-close"></i>
+ </div>
+ <div class="chat-messages">
+ <div class="message">
+ <div class="message-content">
+ <span class="issue-detail-word-break">{{::issueHistory.description}}</span>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!-- �븯�쐞�씠�뒋 湲곕줉 蹂닿린 -->
+ <div ng-if="vm.activeTab == 'RECODE_DOWN'">
+ <div class="no-cont2" ng-if="vm.viewer.activeDownAllHistory.length < 1" translate="common.noRecord">
+ 湲곕줉�씠 �뾾�뒿�땲�떎.
+ </div>
+ <div class="activity-item" ng-repeat="issueDownHistory in vm.viewer.activeDownAllHistory">
+ <!-- 湲곕줉�씤 寃쎌슦 -->
+ <div class="activity-content" ng-if="$root.isDefined(issueDownHistory.issueHistoryType)">
+ <div dom-append dom="issueDownHistory.description"></div>
+ </div>
+ <!-- �뙎湲��씤 寃쎌슦 -->
+ <div class="aei-content" ng-if="!$root.isDefined(issueDownHistory.issueHistoryType)">
+ <div class="aei-title">
+ �븯�쐞�씠�뒋 : {{::issueDownHistory.title}}
+ </div>
+ </div>
+ <div class="aei-image" ng-if="!$root.isDefined(issueDownHistory.issueHistoryType)">
+ <div class="user-avatar-w">
+ <img alt="image" ng-src="{{::issueDownHistory.profile}}">
+ </div>
+ </div>
+ <div class="aei-content" ng-if="!$root.isDefined(issueDownHistory.issueHistoryType)">
+ <h6 class="aei-title">
+ {{::issueDownHistory.registerName}}
+ </h6>
+ <div class="date-break">
+ <span>{{::issueDownHistory.registerDate}}</span>
+ </div>
+ <div class="aei-delete"
+ ng-click="fn.removeComment(comment)"
+ ng-show="$root.user.id == comment.registerId">
+ <i class="os-icon os-icon-close"></i>
+ </div>
+ <div class="chat-messages">
+ <div class="message">
+ <div class="message-content">
+ <span class="issue-detail-word-break">{{::issueDownHistory.description}}</span>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <!-- �븯�쐞�씠�뒋 �뙎湲� 蹂닿린 -->
+ <div ng-if="vm.activeTab == 'REPLY_DOWN'">
+ <div class="no-cont2" ng-if="$scope.vm.viewer.downComment.length < 1"
+ translate="common.noComments">
+ �뙎湲��씠 �뾾�뒿�땲�떎.
+ </div>
+ <div class="ae-item" ng-repeat="comment in vm.viewer.downComment">
+ <div class="re-title">
+ <div class='dot'>
+ �븯�쐞�씠�뒋: {{::comment.title}}
+ </div>
+ </div>
+ <div class="aei-image">
+ <div class="user-avatar-w">
+ <img alt="image" ng-src="{{::comment.profile}}">
+ </div>
+ </div>
+ <div class="aei-content">
+ <h6 class="aei-title">
+ {{::comment.registerName}}
+ </h6>
+ <div class="date-break">
+ <span>{{::comment.registerDate}}</span>
+ </div>
+ <div class="aei-delete"
+ ng-click="fn.removeComment(comment)"
+ ng-show="$root.user.id == comment.registerId">
+ <i class="os-icon os-icon-close"></i>
+ </div>
+ <div class="chat-messages">
+ <div class="message">
+ <div class="message-content">
+ <span class="issue-detail-word-break">{{::comment.description}}</span>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
</div>
</div>
--
Gitblit v1.8.0