From 7476ad22442c349f0751709957fee068d463980a Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 수, 01 12월 2021 20:44:51 +0900
Subject: [PATCH] 이슈 수정 오류 및 메일 보내기 템플릿 이미지 추가
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 9 ++++
src/main/java/kr/wisestone/owl/web/controller/IssueController.java | 3 +
src/main/webapp/views/issue/issueSendMailPartners.html | 12 ++++--
src/main/webapp/scripts/app/issue/issueDetail.controller.js | 7 +++
src/main/webapp/assets/styles/main.css | 20 ++++++++++
src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js | 16 +++++++
6 files changed, 61 insertions(+), 6 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
index 685d5d7..14aae02 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -1819,6 +1819,10 @@
for(IssueIsp issueIsp : issue.getIssueIspFields()){
IssueIspVo issueIspVo = ConvertUtil.copyProperties(issueIsp, IssueIspVo.class);
issueIspVo.setId(issueIsp.getId());
+ IspField ispField = issueIsp.getIspField();
+ if (ispField != null) {
+ issueIspVo.setIspId(ispField.getId());
+ }
issueIspVos.add(issueIspVo);
}
issueVo.setIssueIspVos(issueIspVos);
@@ -1831,6 +1835,11 @@
for(IssueHosting issueHosting : issue.getIssueHostingFields()){
IssueHostingVo issueHostingVo = ConvertUtil.copyProperties(issueHosting, IssueHostingVo.class);
issueHostingVo.setId(issueHosting.getId());
+ HostingField hostingField = issueHosting.getHostingField();
+ if (hostingField != null) {
+ issueHostingVo.setHostingId(hostingField.getId());
+ }
+
issueHostingVos.add(issueHostingVo);
}
issueVo.setIssueHostingVos(issueHostingVos);
diff --git a/src/main/java/kr/wisestone/owl/web/controller/IssueController.java b/src/main/java/kr/wisestone/owl/web/controller/IssueController.java
index df56c49..f967ec4 100644
--- a/src/main/java/kr/wisestone/owl/web/controller/IssueController.java
+++ b/src/main/java/kr/wisestone/owl/web/controller/IssueController.java
@@ -31,7 +31,8 @@
@Controller
public class IssueController extends BaseController {
- private static final Logger log = LoggerFactory.getLogger(IssueController.class);
+ private static final Logger
+ log = LoggerFactory.getLogger(IssueController.class);
@Autowired
private IssueService issueService;
diff --git a/src/main/webapp/assets/styles/main.css b/src/main/webapp/assets/styles/main.css
index 720c85c..cd20d76 100644
--- a/src/main/webapp/assets/styles/main.css
+++ b/src/main/webapp/assets/styles/main.css
@@ -30237,4 +30237,24 @@
margin-right: 1rem;
}
+.TemplateIMG {
+ height: 50px;
+ width: 50px;
+}
+
+.TemplateIMG-selected {
+ border: 2px solid #0066ff;
+}
+
+.TemplateIMG:active {
+ border: 2px solid #0066ff;
+}
+
+.TemplateIMG:visited {
+ border: 2px solid #0066ff;
+}
+
+.Template-area {
+ text-align: center;
+}
/* 媛꾪듃李⑦듃 end */
diff --git a/src/main/webapp/scripts/app/issue/issueDetail.controller.js b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
index 3fdb3e4..9a44c3c 100644
--- a/src/main/webapp/scripts/app/issue/issueDetail.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
@@ -131,6 +131,13 @@
angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector}));
+ // �씠�뒋 紐⑸줉 �뜲�씠�꽣 媛깆떊
+ $scope.$on("getIssueList", function () {
+ $scope.fn.getIssueDetail();
+ });
+
+
+
// �븯�쐞 �씠�뒋 �궘�젣
function removeDownIssue(id) {
// �궘�젣 �븣由�
diff --git a/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js b/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
index 1b6d5cc..ffdf7fc 100644
--- a/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
@@ -15,6 +15,7 @@
removeMailTarget : removeMailTarget,
formSubmit : formSubmit, // �뤌 �쟾�넚
formCheck : formCheck, // �뤌 泥댄겕
+ changeTemplate : changeTemplate
};
$scope.vm = {
@@ -59,7 +60,6 @@
// �뾽泥�/ISP/�샇�뒪�똿 �씠硫붿씪 �뤌 �쟾�넚
function formSubmit() {
$rootScope.spinner = true;
-
var content = {
id : $scope.vm.form.id,
template : $scope.vm.form.template,
@@ -121,5 +121,19 @@
return deferred.promise;
}
+
+ function changeTemplate(templateId){
+ $scope.vm.form.template = templateId;
+ // var matches = document.getElementsByClassName('TemplateIMG');
+
+ var elements = document.getElementsByClassName("TemplateIMG");
+ for (let i = elements.length - 1; i >= 0; i--) {
+ if (elements[i].id === templateId) {
+ elements[i].className += " TemplateIMG-selected";
+ } else {
+ elements[i].className = "TemplateIMG";
+ }
+ }
+ }
}]);
});
diff --git a/src/main/webapp/views/issue/issueSendMailPartners.html b/src/main/webapp/views/issue/issueSendMailPartners.html
index 51ac859..9b3f8b8 100644
--- a/src/main/webapp/views/issue/issueSendMailPartners.html
+++ b/src/main/webapp/views/issue/issueSendMailPartners.html
@@ -32,10 +32,14 @@
input-disabled="vm.form.mailUsers == null"
extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, imagePathProp : 'profile',
type : 'partner', maxlength : 100, autoResize : true, stopRemoveBodyEvent : true }"></js-input-autocomplete>
-
- <input ng-model="vm.form.template" value="ISSUE_SEND_1" type="radio">1
- <input ng-model="vm.form.template" value="ISSUE_SEND_2" type="radio">2
- <input ng-model="vm.form.template" value="ISSUE_SEND_3" type="radio">3
+ <div class="Template-area mt-20">
+ <label class="issue-detail-label">�씠硫붿씪 �뀥�뵆由�
+ <div class="mt-20">
+ <img id="ISSUE_SEND_1" class="TemplateIMG" src="assets/images/btn_naver.PNG" ng-click="fn.changeTemplate('ISSUE_SEND_1')">
+ <img id="ISSUE_SEND_2" class="TemplateIMG" src="assets/images/btn_google.png" ng-click="fn.changeTemplate('ISSUE_SEND_2')">
+ <img id="ISSUE_SEND_3" class="TemplateIMG" src="assets/images/btn_kakao.png" ng-click="fn.changeTemplate('ISSUE_SEND_3')">
+ </div>
+ </div>
</div>
</form>
</div>
--
Gitblit v1.8.0