From 6adb341db180240e0af34ace40100912d4ed5257 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 06 1월 2022 11:02:57 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js | 104 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 66 insertions(+), 38 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js b/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
index e45a790..32b7a6e 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,8 +15,8 @@
removeMailTarget : removeMailTarget,
formSubmit : formSubmit, // �뤌 �쟾�넚
formCheck : formCheck, // �뤌 泥댄겕
- changeTemplate : changeTemplate,
- // showEmailTemplate : showEmailTemplate,
+ onChangeEmailTemplate : onChangeEmailTemplate, // �씠硫붿씪 �뀥�뵆由� �꽑�깮�떆 �떎�뻾
+ getEmailTemplateList : getEmailTemplateList // �씠硫붿씪 �뀥�뵆由� 紐⑸줉 媛��졇�삤湲�
};
$scope.vm = {
@@ -24,10 +24,10 @@
ispVos : parameter.ispVos,
hostingVos : parameter.hostingVos,
partners : parameter.partnersAll.slice(),
- html : "issueSendMailPartners.html",
+ html : "",
+ tab : "SEND_TEMPLATE",
form : {
id : parameter.issueId, // �씠�뒋 踰덊샇
- template : "ISSUE_SEND_2",
projects : [{ id : parameter.projectId}], // �봽濡쒖젥�듃
mailUsers : parameter.partners.slice() // 硫붿씪 �쟾�넚諛쏅뒗 �궗�슜�옄
},
@@ -37,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 {
+ $scope.vm.html = "";
+ //SweetAlert.warning($filter("translate")("issue.selectedPartnersMail"),$filter("translate")("issue.selectedPartnersTemplate")); // option �꽑�깮 寃쎄퀬
+ }
+
+ $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 = "";
+ if ($rootScope.isDefined($scope.vm.emailTemplateType)) {
+ $scope.vm.emailTemplates.forEach(function (emailTemplate) {
+ if (emailTemplate.templateType === $scope.vm.emailTemplateType) {
+ $scope.vm.emailTitle = emailTemplate.title;
+ }
+ })
+ }
+ }
+
// �궗�슜�옄 �궘�젣
function removeMailTarget(index) {
@@ -63,8 +117,10 @@
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 = [];
@@ -125,36 +181,8 @@
return deferred.promise;
}
- function changeTemplate(templateId){
- $scope.vm.form.template = templateId;
+ $scope.fn.getEmailTemplateList();
- 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";
- }
- }
-
- // for(let i = 0 ; i <= 3 ; i++){
- // $('#ISSUE_SEND_'+i).click(function(){
- // $('#Email-Template'+i,'#Email-Template4').slideToggle('slow');
- // });
- // }
- // $("#ISSUE_SEND_1").click(function () {
- // $("#Email-Template1,#Email-Template4").slideToggle(0);
- // });
- //
- // $("#ISSUE_SEND_2").click(function() {
- // $( "#Email-Template2,#Email-Template4" ).slideToggle(0);
- // });
- //
- // $("#ISSUE_SEND_3").click(function() {
- // $( "#Email-Template3,#Email-Template4" ).slideToggle(0);
- // });
-
- }
}]);
});
--
Gitblit v1.8.0