From 94bc0a6bad49e818e54a5438a6f202448de05ee0 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 26 1월 2022 15:51:16 +0900
Subject: [PATCH] - 이슈 수정 시 대분류만 선택하고 수정 시 오류 해결 - 전체 댓글 + 메일 보기 / 하위 이슈 댓글 + 메일 보기
---
src/main/webapp/views/issue/issueDetail.html | 172 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 148 insertions(+), 24 deletions(-)
diff --git a/src/main/webapp/views/issue/issueDetail.html b/src/main/webapp/views/issue/issueDetail.html
index 00d275b..c86c85d 100644
--- a/src/main/webapp/views/issue/issueDetail.html
+++ b/src/main/webapp/views/issue/issueDetail.html
@@ -87,7 +87,7 @@
<div class="support-ticket-content-w" ng-controller="issueDetailController">
<div class="support-ticket-content">
<span ng-if="vm.viewer.parentIssueVo != null" class="badge" ng-style="{'background-color' : '#353535', 'border-color' : vm.viewer.issueStatusVo.color, 'color' : '#FFFFFF' }">
- <span class="cursor" ng-click="fn.issueBack()">�긽�쐞 �씠�뒋:{{vm.viewer.parentIssueVo.title}}</span>
+ <span class="cursor" ng-click="fn.goParentIssue()">�긽�쐞 �씠�뒋:{{vm.viewer.parentIssueVo.title}}</span>
</span>
<div class="">
@@ -108,9 +108,9 @@
<!-- <i class="os-icon os-icon-calendar-time mr-20" ng-if="vm.viewer.modifyPermissionCheck"-->
<!-- 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>
+ ng-if="vm.viewer.modifyPermissionCheck" data-toggle="tooltip" data-placement="left" title="�씠�뒋 �닔�젙 �븯湲�"></i>
<!-- �긽�쐞 �씠�뒋媛� �엳�쓣�븣 �뮘濡쒓�湲� 踰꾪듉 �깮�꽦 -->
- <span ng-if="vm.issueIds.length != 0 && vm.issueIds.length != 1" class="issue-close mr-10" ng-click="fn.issueBack()"><i class="os-icon os-icon-arrow-left7" data-toggle="tooltip" data-placement="left" title="�씠�뒋 �뮘濡� �씠�룞"></i></span>
+ <span ng-if="vm.issueIds[0] != vm.viewer.id && vm.issueIds.length != 0 && vm.issueIds.length != 1" class="issue-close mr-10" ng-click="fn.issueBack()"><i class="os-icon os-icon-arrow-left7" 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>
@@ -315,11 +315,20 @@
</div>
</div>
- <div class="col-sm-2">
+ <div class="col-sm-2" ng-if="vm.viewer.modifyPermissionCheck">
<div class="form-group">
<div class="">
<span translate="companyField.email">�씠硫붿씪</span>:
<span class="email_color cursor" ng-click="fn.sendMailVo(vm.viewer.issueCompanyVos)">{{vm.viewer.issueCompanyVos[0].email}}</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="col-sm-2" ng-if="!vm.viewer.modifyPermissionCheck">
+ <div class="form-group">
+ <div class="">
+ <span translate="companyField.email">�씠硫붿씪</span>:
+ <span>{{vm.viewer.issueCompanyVos[0].email}}</span>
</div>
</div>
</div>
@@ -430,11 +439,20 @@
</div>
</div>
- <div class="col-sm-2">
+ <div class="col-sm-2" ng-if="vm.viewer.modifyPermissionCheck">
<div class="form-group">
<div class="">
<span translate="ispField.email">�씠硫붿씪</span>:
<span class="email_color cursor" ng-click="fn.sendMailVo(vm.viewer.issueIspVos)">{{vm.viewer.issueIspVos[0].email}}</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="col-sm-2" ng-if="!vm.viewer.modifyPermissionCheck">
+ <div class="form-group">
+ <div class="">
+ <span translate="ispField.email">�씠硫붿씪</span>:
+ <span>{{vm.viewer.issueIspVos[0].email}}</span>
</div>
</div>
</div>
@@ -501,11 +519,20 @@
</div>
</div>
- <div class="col-sm-2">
+ <div class="col-sm-2" ng-if="vm.viewer.modifyPermissionCheck">
<div class="form-group">
<div class="">
<span translate="hostingField.email">�씠硫붿씪</span>:
<span class="email_color cursor" ng-click="fn.sendMailVo(vm.viewer.issueHostingVos)">{{vm.viewer.issueHostingVos[0].email}}</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="col-sm-2" ng-if="!vm.viewer.modifyPermissionCheck">
+ <div class="form-group">
+ <div class="">
+ <span translate="hostingField.email">�씠硫붿씪</span>:
+ <span>{{vm.viewer.issueHostingVos[0].email}}</span>
</div>
</div>
</div>
@@ -800,22 +827,22 @@
ng-click="fn.updateActiveHistory()"><span
translate="common.fullView">�쟾泥대낫湲�</span></a>
</li>
- <!--<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 class="nav-item cursor">
+ <a class="nav-link" ng-class="{ 'active' : vm.activeTab == 'MAIL_AND_REPLY' }"
+ ng-click="vm.activeTab = 'MAIL_AND_REPLY'"><span translate="common.fullMailsAndComments">�쟾泥대낫湲�(硫붿씪+�뙎湲�)</span></a>
+ </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 == 'MAIL_AND_REPLY_DOWN' }"
+ ng-click="vm.activeTab = 'MAIL_AND_REPLY_DOWN'"><span translate="common.downMailsAndComments">�븯�쐞�씠�뒋(硫붿씪+�뙎湲�)</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>
@@ -956,6 +983,60 @@
</div>
</div>
</div>
+
+ <!-- �쟾泥�(�긽�쐞+�븯�쐞) 硫붿씪+�뙎湲� 蹂닿린 -->
+ <div ng-if="vm.activeTab == 'MAIL_AND_REPLY'">
+ <div class="no-cont2" ng-if="vm.viewer.activeAllMailAndReplyHistory.length < 1" translate="common.noRecord">
+ 湲곕줉�씠 �뾾�뒿�땲�떎.
+ </div>
+
+ <div class="ae-item row" ng-repeat="issueHistory in vm.viewer.activeAllMailAndReplyHistory">
+ <!-- 硫붿씪�씤 寃쎌슦 -->
+ <div class="aei-content" ng-if="$root.isDefined(issueHistory.issueHistoryType)">
+ <div ng-if="!$root.isDefined(issueHistory.desc)" dom-append dom="issueHistory.description"></div>
+ <div ng-if="$root.isDefined(issueHistory.desc)" dom-append dom="issueHistory.desc"></div>
+ </div>
+
+ <!-- �뙎湲��씤 寃쎌슦 -->
+ <div ng-if="!$root.isDefined(issueHistory.issueHistoryType)"
+ ng-show="vm.viewer.title !== issueHistory.title">
+ <span class="dot">
+ *�븯�쐞�씠�뒋 : {{::issueHistory.title}}
+ </span>
+ </div>
+ <div class="aei-image" style="position: absolute; top: 30%" ng-if="!$root.isDefined(issueHistory.issueHistoryType)">
+ <div class="user-avatar-w">
+ <img ng-show="vm.viewer.title !== issueHistory.title"
+ style="margin-top: 15px" alt="image" ng-src="{{::issueHistory.profile}}">
+ <img ng-show="vm.viewer.title === issueHistory.title"
+ alt="image" ng-src="{{::issueHistory.profile}}">
+ </div>
+ </div>
+
+ <div class="aei-content"
+ ng-if="!$root.isDefined(issueHistory.issueHistoryType)">
+ <h6 class="aei-title mt-1 ml-3per">
+ {{::issueHistory.registerName}}
+ </h6>
+ <div class="date-break mt-2 ml-3per">
+ <span>{{::issueHistory.registerDate}}</span>
+ </div>
+ <div class="aei-delete"
+ 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-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="!$root.isDefined(vm.viewer.activeDownAllHistory) || vm.viewer.activeDownAllHistory.length < 1" translate="common.noRecord">
@@ -1000,28 +1081,71 @@
</div>
</div>
+ <!-- �븯�쐞�씠�뒋 硫붿씪+�뙎湲� 蹂닿린 -->
+ <div ng-if="vm.activeTab == 'MAIL_AND_REPLY_DOWN'">
+ <div class="no-cont2" ng-if="vm.viewer.activeDownMailAndReplyHistory.length < 1" translate="common.noRecord">
+ 湲곕줉�씠 �뾾�뒿�땲�떎.
+ </div>
+
+ <div class="ae-item row" ng-repeat="issueHistory in vm.viewer.activeDownMailAndReplyHistory">
+ <div class="aei-content" ng-if="$root.isDefined(issueHistory.issueHistoryType)">
+ <div dom-append dom="issueHistory.desc"></div>
+ </div>
+
+ <!-- �뙎湲��씤 寃쎌슦 -->
+ <div class="aei-content pb-3" ng-if="!$root.isDefined(issueHistory.issueHistoryType)">
+ <div class="dot">
+ *�븯�쐞�씠�뒋 : {{::issueHistory.title}}
+ </div>
+ </div>
+ <div class="aei-image" style="position: absolute; top: 30%" ng-if="!$root.isDefined(issueHistory.issueHistoryType)">
+ <div class="user-avatar-w ">
+ <img style="margin-top: 15px" alt="image" ng-src="{{::issueHistory.profile}}">
+ </div>
+ </div>
+ <div class="aei-content" ng-if="!$root.isDefined(issueHistory.issueHistoryType)">
+ <h6 class="aei-title mt-1 ml-3per">
+ {{::issueHistory.registerName}}
+ </h6>
+ <div class="date-break mt-2" style="margin-left: 3.3%">
+ <span>{{::issueHistory.registerDate}}</span>
+ </div>
+ <div class="aei-delete"
+ 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-content">
+ <span class="issue-detail-word-break">{{::issueHistory.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 class="aei-content pb-3" ng-repeat="comment in vm.viewer.downComment">
+ <div class='dot mt-10 mb-10'>
+ *�븯�쐞�씠�뒋: {{::comment.title}}
</div>
- <div class="aei-image">
+ <div class="aei-image" style="position: absolute; top: 30%">
<div class="user-avatar-w">
- <img alt="image" ng-src="{{::comment.profile}}">
+ <img style="margin-top: 15px" alt="image" ng-src="{{::comment.profile}}">
</div>
</div>
<div class="aei-content">
- <h6 class="aei-title">
+ <h6 class="aei-title mt-1 ml-3per">
{{::comment.registerName}}
</h6>
- <div class="date-break">
+ <div class="date-break mt-2" style="margin-left: 3.3%">
<span>{{::comment.registerDate}}</span>
</div>
<div class="aei-delete"
@@ -1030,7 +1154,7 @@
<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">{{::comment.description}}</span>
</div>
--
Gitblit v1.8.0