From 424867c3809bb49bd1cc8a8db10bf656d8617a1d Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 수, 01 12월 2021 11:49:25 +0900
Subject: [PATCH] 이메일 수정 진행중 , 이슈 상세 및 이슈 리스트 수정
---
src/main/webapp/views/issue/issueDetail.html | 83 ++++++++++++++++++++++++++++-------------
1 files changed, 56 insertions(+), 27 deletions(-)
diff --git a/src/main/webapp/views/issue/issueDetail.html b/src/main/webapp/views/issue/issueDetail.html
index fb4cae4..765c919 100644
--- a/src/main/webapp/views/issue/issueDetail.html
+++ b/src/main/webapp/views/issue/issueDetail.html
@@ -189,52 +189,81 @@
<div class="col-md-4">
<div class="form-group">
<h6 class="info_font" translate="common.detectingInfo">�깘吏��젙蹂�</h6>
- <span class="issue-detail-label" style="position: relative; top: 1rem" ng-show="vm.customFields == ''">�궗�슜�옄 �젙�쓽 �븘�뱶媛믪씠 �뾾�뒿�땲�떎.</span>
+ <span class="issue-detail-label" style="position: relative; top: 1rem" ng-show="vm.viewer.issueCustomFields == ''">�궗�슜�옄 �젙�쓽 �븘�뱶媛믪씠 �뾾�뒿�땲�떎.</span>
</div>
+ </div>
+ <div class="col-md-2">
+ <issue-detail-image-preview images="vm.images"></issue-detail-image-preview>
+ </div>
+ <div ng-show="vm.images.length < 1" class="detail-not-elements width-100">
</div>
</div>
<!-- �궗�슜�옄 �젙�쓽 �븘�뱶 -->
<div class="row">
- <div class="col-md-2" ng-repeat="customField in vm.customFields">
- <h6 class="fc-red" ng-show="customField.customFieldType == 'INPUT'" translate="common.stringField">臾몄옄�뿴 �븘�뱶</h6>
- <h6 class="fc-red" ng-show="customField.customFieldType == 'SINGLE_SELECT'" translate="common.singleSelectionField">�떒�씪 �꽑�깮 �븘�뱶</h6>
- <h6 class="fc-red" ng-show="customField.customFieldType == 'MULTI_SELECT'" translate="common.multipleSelectionField">�떎以� �꽑�깮 �븘�뱶</h6>
- <h6 class="fc-red" ng-show="customField.customFieldType == 'NUMBER'" translate="common.numberField">�닽�옄 �꽑�깮 �븘�뱶</h6>
- <h6 class="fc-red" ng-show="customField.customFieldType == 'DATETIME'" translate="common.datetimeField">�궇吏� �꽑�깮 �븘�뱶</h6>
- <h6 class="fc-red" ng-show="customField.customFieldType == 'IP_ADDRESS'" translate="common.ipAddressField">IP Address �꽑�깮 �븘�뱶</h6>
- <h6 class="fc-red" ng-show="customField.customFieldType == 'EMAIL'" translate="common.emailField">�씠硫붿씪 �꽑�깮 �븘�뱶</h6>
- <h6 class="fc-red" ng-show="customField.customFieldType == 'SITE'" translate="common.siteField">URL �꽑�깮 �븘�뱶</h6>
- <h6 class="fc-red" ng-show="customField.customFieldType == 'TEL'" translate="common.telField">�쟾�솕踰덊샇 �꽑�깮 �븘�뱶</h6>
- <div class="issue-detail-label">{{::customField.name}}</div>
+ <div class="col-md-2" ng-repeat="issueCustomField in vm.viewer.issueCustomFields">
+ <label class="issue-detail-label">{{::issueCustomField.customFieldVo.name}}</label>
<div ng-switch on="issueCustomField.customFieldVo.customFieldType">
<!-- 湲곕낯 �엯�젰 -->
<div ng-switch-when="INPUT">
<!-- �씫湲� 紐⑤뱶 -->
- <span class="issue-detail-word-break">{{::customField.useValues}}</span>
- <span ng-if="!$root.isDefined(customField.useValues)">-</span>
+ <span class="issue-detail-word-break">{{::issueCustomField.useValues}}</span>
+ <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>
</div>
+
+ <div ng-switch-when="NUMBER">
+ <!-- �씫湲� 紐⑤뱶 -->
+ <span class="issue-detail-word-break">{{::issueCustomField.useValues}}</span>
+ <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>
+ </div>
+
+ <div ng-switch-when="DATETIME">
+ <!-- �씫湲� 紐⑤뱶 -->
+ <span class="issue-detail-word-break">{{::issueCustomField.useValues}}</span>
+ <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>
+ </div>
+
+ <div ng-switch-when="IP_ADDRESS">
+ <!-- �씫湲� 紐⑤뱶 -->
+ <span class="issue-detail-word-break">{{::issueCustomField.useValues}}</span>
+ <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>
+ </div>
+
+ <div ng-switch-when="EMAIL">
+ <!-- �씫湲� 紐⑤뱶 -->
+ <span class="issue-detail-word-break">{{::issueCustomField.useValues}}</span>
+ <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>
+ </div>
+
+ <div ng-switch-when="SITE">
+ <!-- �씫湲� 紐⑤뱶 -->
+ <span class="issue-detail-word-break">{{::issueCustomField.useValues}}</span>
+ <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>
+ </div>
+
+ <div ng-switch-when="TEL">
+ <!-- �씫湲� 紐⑤뱶 -->
+ <span class="issue-detail-word-break">{{::issueCustomField.useValues}}</span>
+ <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>
+ </div>
+
<!-- �떒�씪 ���젆�듃 -->
<div ng-switch-when="SINGLE_SELECT">
- <span class="issue-detail-word-break">{{::customField.useValues}}</span>
- <span ng-if="!$root.isDefined(customField.useValues)">-</span>
+ <span class="issue-detail-word-break">{{::issueCustomField.useValues}}</span>
+ <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>
</div>
<!-- 硫��떚 ���젆�듃 -->
<div ng-switch-when="MULTI_SELECT">
<span class="issue-detail-word-break"
- ng-repeat="useValue in customField.useValues">{{::useValue.value}}, </span>
- <span ng-if="!$root.isDefined(customField.useValues)">-</span>
+ ng-repeat="useValue in issueCustomField.useValues">{{::useValue.value}}, </span>
+ <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>
</div>
</div>
</div>
- <div class="pdt0" style="position: relative; bottom: 1rem">
- <issue-detail-image-preview images="vm.images"></issue-detail-image-preview>
- </div>
- <div ng-show="vm.images.length < 1" class="detail-not-elements width-100">
- <span></span>
- </div>
+
</div>
+
<!-- <div class="">
<label class="issue-detail-label"><span>{{vm.viewer.issueCustomFieldValueVos[0].useValue}}</span> </label>
@@ -284,7 +313,7 @@
<div class="form-group">
<div class="">
<span translate="companyField.email">�씠硫붿씪</span>:
- <span class="email_color">{{vm.viewer.issueCompanyVos[0].email}}</span>
+ <span class="email_color cursor" ng-click="fn.sendMail(vm.viewer.id, vm.viewer.projectVo.id)">{{vm.viewer.issueCompanyVos[0].email}}</span>
</div>
</div>
</div>
@@ -344,7 +373,7 @@
<div class="form-group">
<div class="">
<span translate="ispField.email">�씠硫붿씪</span>:
- <span class="email_color">{{vm.viewer.issueIspVos[0].email}}</span>
+ <span class="email_color cursor" ng-click="fn.sendMail(vm.viewer.id, vm.viewer.projectVo.id)">{{vm.viewer.issueIspVos[0].email}}</span>
</div>
</div>
</div>
@@ -405,7 +434,7 @@
<div class="form-group">
<div class="">
<span translate="hostingField.email">�씠硫붿씪</span>:
- <span class="email_color">{{vm.viewer.issueHostingVos[0].email}}</span>
+ <span class="email_color cursor" ng-click="fn.sendMail(vm.viewer.id, vm.viewer.projectVo.id)">{{vm.viewer.issueHostingVos[0].email}}</span>
</div>
</div>
</div>
--
Gitblit v1.8.0