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/issueSendMailPartners.html | 122 ++++++++++++++++++++++++++++++++--------
1 files changed, 96 insertions(+), 26 deletions(-)
diff --git a/src/main/webapp/views/issue/issueSendMailPartners.html b/src/main/webapp/views/issue/issueSendMailPartners.html
index 5645731..eeba1c9 100644
--- a/src/main/webapp/views/issue/issueSendMailPartners.html
+++ b/src/main/webapp/views/issue/issueSendMailPartners.html
@@ -1,7 +1,7 @@
<div class="formModal">
<div class="modal-header faded smaller">
<div class="modal-title">
- <strong translate="issue.selectSendIssueMail">�씠�뒋 硫붿씪 諛쒖넚 ���긽�옄 �꽑�깮</strong>
+ <strong translate="issue.selectSendIssueMail">�씠�뒋 硫붿씪 諛쒖넚</strong>
</div>
<button aria-label="Close" class="close" type="button" ng-click="fn.cancel()">
<span aria-hidden="true"> ×</span>
@@ -11,51 +11,121 @@
<div class="modal-body">
<form role="form" name="issueSendForm">
<div class="form-group">
- <small translate="issue.sendIssueSelectedUsers">�봽濡쒖젥�듃�뿉 李몄뿬�븯怨� �엳�뒗 �떎瑜� �궗�슜�옄�뿉寃� �씠�뒋 �젙蹂대�� 蹂대깄�땲�떎.</small>
+ <div ng-if="vm.form.account[0].account.length < 1" class="help-block form-text text-danger"
+ translate="issue.sendIssueSelectedNotPartners">�빐�떦 �씠�뒋�뿉 �냽�빐 �엳�뒗 �뙆�듃�꼫 �떞�떦�옄媛� �뾾�뒿�땲�떎.</div>
+ <small ng-if="vm.form.account[0].account.length > 0" translate="issue.sendIssueSelectedPartners">�빐�떦 �씠�뒋�뿉 �냽�빐 �엳�뒗 �뙆�듃�꼫 �떞�떦�옄�뿉寃� �씠�뒋 �젙蹂대�� 蹂대깄�땲�떎.</small>
<div class="select3-selection__choicediv">
- <span class="select3-selection__choice" ng-repeat="user in vm.form.mailUsers">
- <span>{{user.name}}({{user.account}})</span>
+ <span class="select3-selection__choice" ng-repeat="user in vm.form.account[0].account track by $index">
+ <span>{{vm.form.account[0].name[$index]}}({{user}})</span>
<span class="select3-selection__choice__remove"
ng-click="fn.removeMailTarget($index)">횞</span>
</span>
</div>
+ <!--<label class="issue-label mt-10">
+ <span translate="issue.selectPartners">�뾽泥� �꽑�깮</span> <code class="highlighter-rouge">*</code>
+ </label>
<js-input-autocomplete data-input-name="mailUsers"
owl-auto-focus
target=".auto-complete-i0nput"
- selected-model="vm.form.mailUsers"
+ selected-model="vm.form.account[0].account"
+ custom-input="true"
search="vm.userName"
page="vm.autoCompletePage.user.page"
total-page="vm.autoCompletePage.user.totalPage"
- source="fn.getMailTargetAll(vm.form.mailUsers)"
- translation-texts="{ empty : 'common.emptyUser'}"
- input-disabled="vm.form.mailUsers == null"
+ source="fn.getMailTargetAll(vm.form.account[0])"
+ translation-texts="{ empty : 'common.emptyCompanyPartners'}"
+ input-disabled="vm.form.account[0].account == null"
+ broad-cast="getMailTarget"
extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, imagePathProp : 'profile',
- type : 'partner', maxlength : 100, autoResize : true, stopRemoveBodyEvent : true }"></js-input-autocomplete>
- <div class="Template-area mt-20">
- <label class="issue-detail-label">�씠硫붿씪 �뀥�뵆由�</label>
- <div class="mt-10">
- <img id="ISSUE_SEND_1" class="TemplateIMG" src="assets/images/emailthumb-badcode.png" ng-click="fn.changeTemplate('ISSUE_SEND_1')">
- <img id="ISSUE_SEND_2" class="TemplateIMG" src="assets/images/emailthumb-domain.png" ng-click="fn.changeTemplate('ISSUE_SEND_2')">
- <img id="ISSUE_SEND_3" class="TemplateIMG" src="assets/images/emailthumb-hosting.png" ng-click="fn.changeTemplate('ISSUE_SEND_3')">
- <div>
- <span class="email_font">�븙�꽦肄붾뱶</span>
- <span class="email_font offset-detail-3">�룄硫붿씤</span>
- <span class="email_font offset-detail-3">�샇�뒪�똿</span>
+ type : 'partner', maxlength : 100, autoResize : true, stopRemoveBodyEvent : true }"></js-input-autocomplete>-->
+
+ <div class="form-group mb10 mt-20">
+ <label for="emailTemplateForm" class="issue-label">
+ <span translate="issue.selectTemplate">�뀥�뵆由� �꽑�깮</span> <code class="highlighter-rouge">*</code>
+ </label>
+ <select id="emailTemplateForm"
+ name="emailTemplate"
+ class="form-control input-sm issue-select-label"
+ ng-model="vm.emailTemplateType"
+ ng-change="fn.onChangeEmailTemplate()"
+ required>
+ <option value="" ng-selected="true">�꽑�깮�븯�꽭�슂</option>
+ <option ng-repeat="emailTemplate in vm.emailTemplates"
+ value="{{emailTemplate.templateType}}"
+ translate="{{emailTemplate.title}}">
+ </option>
+ </select>
+ </div>
+
+ <label class="issue-label"><span translate="common.title">�젣紐�</span></label>
+ <input id="title"
+ type="text"
+ name="title"
+ class="form-control"
+ kr-input
+ ng-model="vm.emailTitle"
+ autocomplete="off">
+
+ <div class="form-group mb10 mt-10">
+ <label class="issue-label"><span translate="common.content">�궡�슜</span></label>
+ <summernote
+ class="summernote"
+ lang="ko-KR"
+ config="vm.options"
+ ng-model="vm.html"
+ target=".note-editable"></summernote>
+ </div>
+
+ <div class="form-group mgb5 mt-10">
+ <label class="issue-label"><span translate="common.attachFiles">�뙆�씪 泥⑤�</span></label>
+ <div class="filebox input-group">
+ <input class="upload-name form-control"
+ placeholder="{{'users.pleaseSelectFile' | translate}}"
+ tabindex="-1"
+ disabled="disabled">
+ <label for="uploadFileField"><span
+ translate="common.selectFile">�뙆�씪�꽑�깮</span></label>
+ <input id="uploadFileField"
+ tabindex="-1"
+ type="file"
+ class="form-control"
+ multiple
+ ng-file-select="fn.onFileSelect($files)">
+ </div>
+
+ <div class="select2-selection__choicediv">
+ <div class="select2-selection__choice2" ng-repeat="file in vm.form.files">
+ <div class="select2-selection__choice2__remove" ng-click="fn.removeUploadFile($index)">
+ 횞
+ </div>
+ <div class="ssg-items ssg-items-blocks">
+ <div class="ssg-item">
+ <div class="item-icon">
+ <!-- 臾몄꽌 -->
+ <i class="os-icon os-icon-file-text" ng-if="file.fileType == 'DOC'"></i>
+ <!-- 誘몃뵒�뼱 -->
+ <i class="os-icon os-icon-film" ng-if="file.fileType == 'MEDIA'"></i>
+ <!-- �씠誘몄�(�뾽濡쒕뱶 �쟾) -->
+ <i class="os-icon os-icon-documents-07"
+ ng-if="file.fileType == 'IMAGE'"></i>
+ <!-- 湲고� -->
+ <i class="os-icon os-icon-ui-51" ng-if="file.fileType == 'ETC'"></i>
+ </div>
+ <div class="item-name">
+ <small>{{file.name}}</small>
+ </div>
+ <div class="item-amount">
+ ({{file.size/1024/1024 | number:2}} MB)
+ </div>
</div>
</div>
-
- <div>
- <img style="height: 24px; width: 250px; display: none; margin: 0 auto;" id="Email-Template1" src="assets/images/badcode.png">
- <img style="height: 24px; width: 250px; display: none; margin: 50px auto 0;" id="Email-Template2" src="assets/images/domain.png">
- <img style="height: 24px; width: 250px; display: none; margin: 50px auto 0;" id="Email-Template3" src="assets/images/hosting.png">
- <img style="height: 500px; width: 440px; display: none; margin: 0 auto;" class="mt-20 mb-30" id="Email-Template4" src="assets/images/Email.png">
</div>
</div>
+ </div>
</div>
</form>
</div>
-
<div class="modal-footer buttons-on-right">
<button type="button" class="btn btn-md btn-grey" ng-click="fn.cancel()"><span
--
Gitblit v1.8.0