From 4af75fe18d97960fabea0fadb28a69c01a038bc4 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 25 1월 2022 17:01:37 +0900
Subject: [PATCH] - 파트너명 특수문자 입력 가능하도록 수정 - 이슈 import/export 시 파트너 정보 추가 - 이슈상세 - 메일 기록 추가
---
src/main/webapp/views/issue/issueDetail.html | 217 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 192 insertions(+), 25 deletions(-)
diff --git a/src/main/webapp/views/issue/issueDetail.html b/src/main/webapp/views/issue/issueDetail.html
index e050dd6..a24b54f 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,7 +108,7 @@
<!-- <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>
<!-- �긽�쐞 �씠�뒋媛� �엳�쓣�븣 �긽�꽭�솕硫� �떕湲곕쾭�듉 �쐞移� 議곗젙 -->
@@ -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>
@@ -338,6 +347,51 @@
<div class="">
<span translate="companyField.memo">鍮꾧퀬</span>:
<span>{{vm.viewer.issueCompanyVos[0].memo}}</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="col-sm-2">
+ <div class="form-group">
+ <div class="">
+ <span translate="companyField.companyType">湲곗뾽援щ텇</span>:
+ <span>{{vm.viewer.issueCompanyVos[0].companyTypeName}}</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="col-sm-2">
+ <div class="form-group">
+ <div class="">
+ <span translate="companyField.parentSector">�뾽醫�(��遺꾨쪟)</span>:
+ <span>{{vm.viewer.issueCompanyVos[0].parentSectorName}}</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="col-sm-2">
+ <div class="form-group">
+ <div class="">
+ <span translate="companyField.childSector">�뾽醫�(以묐텇瑜�)</span>:
+ <span>{{vm.viewer.issueCompanyVos[0].childSectorName}}</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="col-sm-2">
+ <div class="form-group">
+ <div class="">
+ <span translate="companyField.region">吏��뿭</span>:
+ <span>{{vm.viewer.issueCompanyVos[0].regionName}}</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="col-sm-2">
+ <div class="form-group">
+ <div class="">
+ <span translate="companyField.status">�긽�깭</span>:
+ <span>{{vm.viewer.issueCompanyVos[0].statusName}}</span>
</div>
</div>
</div>
@@ -385,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>
@@ -456,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>
@@ -492,7 +564,23 @@
<!--<div class="col-md-1">
<button class="btn btn-darkgrey offset-10" ng-click="fn.addRelationIssueTableConfig()" type="button"><span translate="issue.settingTableDisplay">�뀒�씠釉� �몴�떆 �꽕�젙</span></button>
</div>-->
- <div class="btn-group offset-11">
+ <div class="col-md-3 mt-2">
+ <div class="dataTables_length">
+ <label>
+ <select name="relPageRow"
+ tabindex="-1"
+ class="form-control form-control-sm"
+ ng-change="fn.changeDetailPageRowCount()"
+ ng-model="vm.subPage.selectedRelPageRowCount">
+ <option value="10">10</option>
+ <option value="50">50</option>
+ <option value="100">100</option>
+ </select> {{vm.subPage.selectedRelPage}}-{{vm.responseData.relTotalPage}} /
+ {{vm.responseData.relTotalCount | number}}<span translate="common.few">嫄�</span>
+ </label>
+ </div>
+ </div>
+ <div class="btn-group" style="left: 975px; padding: 5px">
<button aria-expanded="false" aria-haspopup="true"
tabindex="-1"
class="btn btn-secondary dropdown-toggle"
@@ -541,10 +629,25 @@
ng-click="fn.addRelationIssue()"
translate="issue.addRelationIssue">�뿰愿� �씠�뒋 異붽�</button>
<button type="button" class="btn btn-sm btn-primary btn-roundRel offset-1"
- ng-click="fn.addRelationIssueForm(vm.viewer.id)">
+ ng-click="fn.addRelationIssueForm(vm.viewer.id, vm.viewer.issueTypeVo.id)">
<i class="os-icon os-icon-plus"><span></span></i>
</button>
</div>
+ </div>
+ <div class="controls-below-table text-center">
+ <ul uib-pagination
+ boundary-links-numbes="true"
+ items-per-page="vm.subPage.selectedRelPageRowCount"
+ total-items="vm.responseData.relTotalCount"
+ ng-model="vm.subPage.selectedRelPage"
+ max-size="10"
+ ng-click="fn.getIssueDetail(vm.subPage.selectedRelPage - 1, vm.subPage.selectedDownPage - 1)"
+ class="pagination pagination-sm"
+ previous-text="<"
+ next-text=">"
+ first-text=""
+ last-text="">
+ </ul>
</div>
</div>
@@ -561,7 +664,23 @@
<div class="col-sm-1">
<button class="btn btn-darkgrey offset-10" ng-click="fn.addDownIssueTableConfig()" type="button"><span translate="issue.settingTableDisplay">�뀒�씠釉� �몴�떆 �꽕�젙</span></button>
</div>-->
- <div class="btn-group offset-11">
+ <div class="col-md-5 mt-2">
+ <div class="dataTables_length">
+ <label>
+ <select name="downPageRow"
+ tabindex="-1"
+ class="form-control form-control-sm"
+ ng-change="fn.changeDetailPageRowCount()"
+ ng-model="vm.subPage.selectedDownPageRowCount">
+ <option value="10">10</option>
+ <option value="50">50</option>
+ <option value="100">100</option>
+ </select> {{vm.subPage.selectedDownPage}}-{{vm.responseData.downTotalPage}} /
+ {{vm.responseData.downTotalCount | number}}<span translate="common.few">嫄�</span>
+ </label>
+ </div>
+ </div>
+ <div class="btn-group" style="left: 730px; padding: 5px">
<button aria-expanded="false" aria-haspopup="true"
tabindex="-1"
class="btn btn-secondary dropdown-toggle"
@@ -600,10 +719,25 @@
ng-click="fn.addDownIssue()"
translate="issue.addDownIssue">異붽�</button>
<button type="button" class="btn btn-sm btn-primary btn-roundRel offset-1"
- ng-click="fn.addDownIssueForm(vm.viewer.id)">
+ ng-click="fn.addDownIssueForm(vm.viewer.id, vm.viewer.issueTypeVo.id)">
<i class="os-icon os-icon-plus"><span></span></i>
</button>
</div>
+ </div>
+ <div class="controls-below-table text-center">
+ <ul uib-pagination
+ boundary-links-numbes="true"
+ items-per-page="vm.subPage.selectedDownPageRowCount"
+ total-items="vm.responseData.downTotalCount"
+ ng-model="vm.subPage.selectedDownPage"
+ max-size="10"
+ ng-click="fn.getIssueDetail(vm.subPage.selectedRelPage - 1, vm.subPage.selectedDownPage - 1)"
+ class="pagination pagination-sm"
+ previous-text="<"
+ next-text=">"
+ first-text=""
+ last-text="">
+ </ul>
</div>
</div>
@@ -693,22 +827,30 @@
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 == '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' }"
+ ng-click="vm.activeTab = 'MAIL'"><span translate="common.mails">硫붿씪</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 == 'RECODE_DOWN' }"
ng-click="vm.activeTab = 'RECODE_DOWN'"><span translate="common.recordDown">�븯�쐞�씠�뒋 湲곕줉</span></a>
</li>
- <!--<li class="nav-item cursor">
+ <li class="nav-item cursor">
+ <a class="nav-link" ng-class="{ 'active' : vm.activeTab == 'MAIL_DOWN' }"
+ ng-click="vm.activeTab = 'MAIL_DOWN'"><span translate="common.downMails">�븯�쐞�씠�뒋 硫붿씪</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>-->
+ </li>
</ul>
</div>
@@ -849,6 +991,20 @@
</div>
</div>
</div>
+
+ <!-- 硫붿씪 蹂닿린 -->
+ <div ng-if="vm.activeTab == 'MAIL'">
+ <div class="no-cont2" ng-if="vm.viewer.activeParentMailHistory.length < 1" translate="common.noRecord">
+ 湲곕줉�씠 �뾾�뒿�땲�떎.
+ </div>
+
+ <div class="ae-item" ng-repeat="issueHistory in vm.viewer.activeParentMailHistory">
+ <div class="aei-content" ng-if="$root.isDefined(issueHistory.issueHistoryType)">
+ <div dom-append dom="issueHistory.description"></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">
@@ -893,28 +1049,39 @@
</div>
</div>
+ <!-- �븯�쐞�씠�뒋 硫붿씪 蹂닿린 -->
+ <div ng-if="vm.activeTab == 'MAIL_DOWN'">
+ <div class="no-cont2" ng-if="vm.viewer.activeDownMailHistory.length < 1" translate="common.noRecord">
+ 湲곕줉�씠 �뾾�뒿�땲�떎.
+ </div>
+
+ <div class="ae-item" ng-repeat="issueHistory in vm.viewer.activeDownMailHistory">
+ <div class="aei-content" ng-if="$root.isDefined(issueHistory.issueHistoryType)">
+ <div dom-append dom="issueHistory.description"></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"
@@ -923,7 +1090,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