From c5b1f5bce826ec57ad1f45c1ab7fedb75ed7f9cb Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 월, 20 12월 2021 17:39:40 +0900
Subject: [PATCH] 이슈 상세 뒤로가기 버튼 생성
---
src/main/webapp/views/issue/issueDetail.html | 83 +++++++++++++++++++++++------------------
1 files changed, 47 insertions(+), 36 deletions(-)
diff --git a/src/main/webapp/views/issue/issueDetail.html b/src/main/webapp/views/issue/issueDetail.html
index 1b87042..ecc2de2 100644
--- a/src/main/webapp/views/issue/issueDetail.html
+++ b/src/main/webapp/views/issue/issueDetail.html
@@ -109,6 +109,9 @@
ng-click="fn.reservation(vm.viewer.id)" data-toggle="tooltip" data-placement="right" title="�씠�뒋 諛쒖깮 �삁�빟 �븯湲�"></i>
<i class="os-icon os-icon-edit-1 mr-20" ng-click="fn.modify(vm.viewer.id)"
ng-if="vm.viewer.modifyPermissionCheck && vm.viewer.issueStatusVo.issueStatusType != 'CLOSE'" data-toggle="tooltip" data-placement="left" title="�씠�뒋 �닔�젙 �븯湲�"></i>
+ <!-- �긽�쐞 �씠�뒋媛� �엳�쓣�븣 �뮘濡쒓�湲� 踰꾪듉 �깮�꽦 -->
+ <span ng-if="vm.viewer.parentIssueVo.id != null" class="issue-close mr-10" ng-click="fn.issueBack()"><i class="os-icon os-icon-skip-back" data-toggle="tooltip" data-placement="left" title="�씠�뒋 �뮘濡� �씠�룞"></i></span>
+ <!-- �긽�쐞 �씠�뒋媛� �엳�쓣�븣 �긽�꽭�솕硫� �떕湲곕쾭�듉 �쐞移� 議곗젙 -->
<span class="issue-close" ng-click="fn.listView()"><i class="os-icon os-icon-close" data-toggle="tooltip" data-placement="left" title="�긽�꽭 �솕硫� �떕湲�"></i></span>
</a>
</div>
@@ -512,7 +515,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 +564,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"
@@ -692,6 +695,9 @@
<div class="tab-content">
<!-- �쟾泥� 湲곕줉 蹂닿린 -->
<div ng-if="vm.activeTab == 'ALL'">
+ <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"
@@ -699,40 +705,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 +772,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 +792,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 +808,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>
@@ -820,35 +831,35 @@
</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 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 +899,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