From 8c9fe9cf7890c0360672b8cd6924c76f11452006 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 20 12월 2021 17:00:01 +0900
Subject: [PATCH] - 이슈상세에서 하위이슈 추가 검색시 상위 이슈는 검색 리스트에서 제외 - 이슈상세에서 연관 이슈/하위 이슈 리스트 전체 불러오기(10개이상 스크롤) - 이슈추가,수정 시 파트너 정보 불러오기 수정 - 하위이슈 히스토리 코드 수정
---
src/main/webapp/views/issue/issueDetail.html | 92 +++++++++++++++++++++++++--------------------
1 files changed, 51 insertions(+), 41 deletions(-)
diff --git a/src/main/webapp/views/issue/issueDetail.html b/src/main/webapp/views/issue/issueDetail.html
index 6afd634..29da70c 100644
--- a/src/main/webapp/views/issue/issueDetail.html
+++ b/src/main/webapp/views/issue/issueDetail.html
@@ -512,7 +512,7 @@
<js-autocomplete-single data-input-name="issue"
selected-model="vm.form.issues"
search="vm.issueName"
- source="fn.getIssueList(vm.issueName, vm.issueTypeId, vm.form.issues, vm.autoCompletePage.issue.page, fn.getIssueListCallBack)"
+ source="fn.getRelIssueList(vm.issueName, vm.issueTypeId, vm.form.issues, vm.autoCompletePage.issue.page, fn.getIssueListCallBack)"
page="vm.autoCompletePage.issue.page"
total-page="vm.autoCompletePage.issue.totalPage"
input-disabled="false"
@@ -561,7 +561,7 @@
<js-autocomplete-single data-input-name="issue"
selected-model="vm.form.issuesDown"
search="vm.issueNameDown"
- source="fn.getDownIssueList(vm.issueNameDown, vm.issueTypeId, vm.form.issuesDown, vm.autoCompletePageDown.issue.page, fn.getDownIssueListCallBack)"
+ source="fn.getDownIssueList(vm.issueNameDown, vm.issueTypeId, vm.viewer.parentIssueVo.id, vm.form.issuesDown, vm.autoCompletePageDown.issue.page, fn.getDownIssueListCallBack)"
page="vm.autoCompletePageDown.issue.page"
total-page="vm.autoCompletePageDown.issue.totalPage"
input-disabled="false"
@@ -635,7 +635,7 @@
<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="form-group row mt-10">
<div class="col-sm-12">
<div class="input-group">
<input class="form-control"
@@ -692,45 +692,55 @@
<div class="tab-content">
<!-- �쟾泥� 湲곕줉 蹂닿린 -->
<div ng-if="vm.activeTab == 'ALL'">
- <div class="ae-item" ng-repeat="activeHistory in vm.viewer.activeHistory">
- <!-- 湲곕줉�씤 寃쎌슦 -->
+ <div class="no-cont2" ng-if="vm.viewer.activeHistory.length < 1" translate="common.noRecord">
+ 湲곕줉�씠 �뾾�뒿�땲�떎.
+ </div>
+ <div class="ae-item row" ng-repeat="activeHistory in vm.viewer.activeHistory">
+ <!-- 湲곕줉�씤 寃쎌슦 -->
<div class="aei-content"
ng-if="$root.isDefined(activeHistory.issueHistoryType)">
<!--<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">
- <div>
- �븯�쐞�씠�뒋 : {{::activeHistory.title}}
- </div>
+ <span class="dot">
+ *�븯�쐞�씠�뒋 : {{::activeHistory.title}}
+ </span>
</div>
- <div class="aei-image" ng-if="!$root.isDefined(activeHistory.issueHistoryType)">
+ <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}}">
+ <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">
+ <h6 class="aei-title mt-1 ml-3per">
{{::activeHistory.registerName}}
</h6>
- <div class="date-break">
+ <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">
+ <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>
@@ -759,7 +769,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">
@@ -779,35 +789,35 @@
湲곕줉�씠 �뾾�뒿�땲�떎.
</div>
- <div class="activity-item" 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>
</h6>-->
- <div class="activity-content" ng-if="$root.isDefined(issueHistory.issueHistoryType)">
+ <div class="aei-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="aei-image" style="position: absolute; top: 30%" 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">
+ <h6 class="aei-title mt-1 ml-3per">
{{::issueHistory.registerName}}
</h6>
- <div class="date-break">
+ <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">
+ <div class="message ml-3per">
<div class="message-content">
<span class="issue-detail-word-break">{{::issueHistory.description}}</span>
</div>
@@ -818,39 +828,39 @@
</div>
<!-- �븯�쐞�씠�뒋 湲곕줉 蹂닿린 -->
<div ng-if="vm.activeTab == 'RECODE_DOWN'">
- <div class="no-cont2" ng-if="vm.viewer.activeDownAllHistory.length < 1" translate="common.noRecord">
+ <div class="no-cont2" ng-if="!$root.isDefined(vm.viewer.activeDownAllHistory) || vm.viewer.activeDownAllHistory.length < 1" translate="common.noRecord">
湲곕줉�씠 �뾾�뒿�땲�떎.
</div>
- <div class="activity-item" ng-repeat="issueDownHistory in vm.viewer.activeDownAllHistory">
+ <div class="ae-item row" 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 class="aei-content" ng-if="$root.isDefined(issueDownHistory.issueHistoryType)">
+ <div dom-append dom="issueDownHistory.desc"></div>
</div>
<!-- �뙎湲��씤 寃쎌슦 -->
- <div class="aei-content" ng-if="!$root.isDefined(issueDownHistory.issueHistoryType)">
- <div class="aei-title">
- �븯�쐞�씠�뒋 : {{::issueDownHistory.title}}
+ <div class="aei-content pb-3" ng-if="!$root.isDefined(issueDownHistory.issueHistoryType)">
+ <div class="dot">
+ *�븯�쐞�씠�뒋 : {{::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 class="aei-image" style="position: absolute; top: 30%" ng-if="!$root.isDefined(issueDownHistory.issueHistoryType)">
+ <div class="user-avatar-w ">
+ <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">
+ <h6 class="aei-title mt-1 ml-3per">
{{::issueDownHistory.registerName}}
</h6>
- <div class="date-break">
+ <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">
- <div class="message">
+ <div class="message" style="margin-left: 3.3%">
<div class="message-content">
<span class="issue-detail-word-break">{{::issueDownHistory.description}}</span>
</div>
@@ -886,7 +896,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">
--
Gitblit v1.8.0