From b769c2dcd17af4978fe152ec2ae306a6d6d7773d Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 03 1월 2022 14:31:05 +0900
Subject: [PATCH] 이메일 전송 템플릿을 가져올때 db에서 가져오지 않고 서버의 이메일 템플릿을 가져오도록 수정
---
src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js | 76 ++++++++++++++++++++++++++++++++++---
1 files changed, 69 insertions(+), 7 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js b/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
index dae8caa..9e8d0c7 100644
--- a/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
@@ -5,8 +5,8 @@
'angular'
],
function (app, angular) {
- app.controller('issueSendMailPartnersController', ['$scope', '$rootScope', '$q','$log', '$resourceProvider', '$uibModalInstance', '$controller', '$injector', 'SweetAlert', '$filter', 'parameter', 'Issue',
- function ($scope, $rootScope, $q, $log, $resourceProvider, $uibModalInstance, $controller, $injector, SweetAlert, $filter, parameter, Issue) {
+ app.controller('issueSendMailPartnersController', ['$scope', '$rootScope', '$q','$log', '$resourceProvider', '$uibModalInstance', '$controller', '$injector', 'SweetAlert', '$filter', 'parameter', 'Issue', 'EmailTemplate',
+ function ($scope, $rootScope, $q, $log, $resourceProvider, $uibModalInstance, $controller, $injector, SweetAlert, $filter, parameter, Issue, EmailTemplate) {
$scope.fn = {
getUserListCallBack : getUserListCallBack, // �궗�슜�옄 auto complete callback function
@@ -15,6 +15,9 @@
removeMailTarget : removeMailTarget,
formSubmit : formSubmit, // �뤌 �쟾�넚
formCheck : formCheck, // �뤌 泥댄겕
+ onChangeEmailTemplate : onChangeEmailTemplate, // �씠硫붿씪 �뀥�뵆由� �꽑�깮�떆 �떎�뻾
+ getEmailTemplateList : getEmailTemplateList // �씠硫붿씪 �뀥�뵆由� 紐⑸줉 媛��졇�삤湲�
+ // showEmailTemplate : showEmailTemplate,
};
$scope.vm = {
@@ -22,9 +25,9 @@
ispVos : parameter.ispVos,
hostingVos : parameter.hostingVos,
partners : parameter.partnersAll.slice(),
+ html : "",
form : {
id : parameter.issueId, // �씠�뒋 踰덊샇
- template : "ISSUE_SEND_2",
projects : [{ id : parameter.projectId}], // �봽濡쒖젥�듃
mailUsers : parameter.partners.slice() // 硫붿씪 �쟾�넚諛쏅뒗 �궗�슜�옄
},
@@ -34,10 +37,64 @@
page : 0,
totalPage : 0
}
- }
+ },
+ emailTitle : "",
+ emailTemplateId : -1,
+ emailTemplates : [],
+ emailTemplateType : "",
};
angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector}));
+
+ function onChangeEmailTemplate() {
+ var content = {
+ templateType : $scope.vm.emailTemplateType,
+ issueId : parameter.issueId
+ }
+ EmailTemplate.find($resourceProvider.getContent(
+ content,
+ $resourceProvider.getPageContent(0, 10))).then(function (result) {
+
+ if (result.data.message.status === "success") {
+ $scope.vm.html = result.data.data.template;
+ }
+ else {
+ SweetAlert.error($filter("translate")("issue.failedIssueMail"), result.data.message.message); // "�씠�뒋 硫붿씪 諛쒖넚 �떎�뙣"
+ }
+
+ $rootScope.spinner = false;
+ });
+ }
+
+ function getEmailTemplateList() {
+ $scope.vm.emailTemplates.push({
+ templateType : "ISSUE_SEND_1",
+ title : "�뀥�뵆由�1"
+ });
+
+ $scope.vm.emailTemplates.push({
+ templateType : "ISSUE_SEND_2",
+ title : "�뀥�뵆由�2"
+ });
+
+
+ $scope.vm.emailTemplates.push({
+ templateType : "ISSUE_SEND_3",
+ title : "�뀥�뵆由�3"
+ });
+
+ $scope.vm.emailTemplateId = 1;
+ $scope.vm.emailTitle = "";
+ $scope.vm.emailTemplates.forEach(function (emailTemplate) {
+ /*if (emailTemplate.id === $scope.vm.emailTemplateId) {
+ $scope.vm.emailTitle = emailTemplate.title;
+ }*/
+ if (emailTemplate.templateType === $scope.vm.emailTemplateType) {
+ $scope.vm.emailTitle = emailTemplate.title;
+ }
+ })
+ }
+
// �궗�슜�옄 �궘�젣
function removeMailTarget(index) {
@@ -59,10 +116,11 @@
// �뾽泥�/ISP/�샇�뒪�똿 �씠硫붿씪 �뤌 �쟾�넚
function formSubmit() {
$rootScope.spinner = true;
-
var content = {
- // id : $scope.vm.form.id,
- template : $scope.vm.form.template,
+ id : $scope.vm.emailTemplateId,
+ template : $scope.vm.html,
+ title : $scope.vm.emailTitle,
+ issueId : $scope.vm.form.id,
sendEmails : (function () {
var sendEmails = [];
@@ -81,6 +139,7 @@
if (result.data.message.status === "success") {
SweetAlert.success($filter("translate")("issue.succeededIssueMail"), $filter("translate")("issue.sentToTheSelectedUser")); // "�씠�뒋 硫붿씪 諛쒖넚 �셿猷�"
$scope.fn.cancel();
+ $rootScope.$broadcast("getIssueDetail", {id: $rootScope.currentDetailIssueId});
}
else {
SweetAlert.error($filter("translate")("issue.failedIssueMail"), result.data.message.message); // "�씠�뒋 硫붿씪 諛쒖넚 �떎�뙣"
@@ -121,5 +180,8 @@
return deferred.promise;
}
+
+ $scope.fn.getEmailTemplateList();
}]);
+
});
--
Gitblit v1.8.0