From e48d62efe756754237fb10c263f24c4f51587ad0 Mon Sep 17 00:00:00 2001 From: wyu <kknd09321@nate.com> Date: 수, 01 12월 2021 18:28:30 +0900 Subject: [PATCH] 이메일 수정 진행중 --- src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js | 43 +++++++------------------------------------ 1 files changed, 7 insertions(+), 36 deletions(-) diff --git a/src/main/webapp/scripts/app/issue/issueSendMail.controller.js b/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js similarity index 74% rename from src/main/webapp/scripts/app/issue/issueSendMail.controller.js rename to src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js index 24b2e5b..dae8caa 100644 --- a/src/main/webapp/scripts/app/issue/issueSendMail.controller.js +++ b/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js @@ -5,7 +5,7 @@ 'angular' ], function (app, angular) { - app.controller('issueSendMailController', ['$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', function ($scope, $rootScope, $q, $log, $resourceProvider, $uibModalInstance, $controller, $injector, SweetAlert, $filter, parameter, Issue) { $scope.fn = { @@ -14,7 +14,7 @@ getMails : getMails, removeMailTarget : removeMailTarget, formSubmit : formSubmit, // �뤌 �쟾�넚 - formCheck : formCheck // �뤌 泥댄겕 + formCheck : formCheck, // �뤌 泥댄겕 }; $scope.vm = { @@ -24,6 +24,7 @@ partners : parameter.partnersAll.slice(), form : { id : parameter.issueId, // �씠�뒋 踰덊샇 + template : "ISSUE_SEND_2", projects : [{ id : parameter.projectId}], // �봽濡쒖젥�듃 mailUsers : parameter.partners.slice() // 硫붿씪 �쟾�넚諛쏅뒗 �궗�슜�옄 }, @@ -55,12 +56,13 @@ return false; } - // �뤌 �쟾�넚 + // �뾽泥�/ISP/�샇�뒪�똿 �씠硫붿씪 �뤌 �쟾�넚 function formSubmit() { $rootScope.spinner = true; var content = { - id : $scope.vm.form.id, + // id : $scope.vm.form.id, + template : $scope.vm.form.template, sendEmails : (function () { var sendEmails = []; @@ -70,39 +72,9 @@ return sendEmails; })(), - companyVos : (function () { - var companyVos = []; - - angular.forEach($scope.vm.companyVos, function (company) { - companyVos.push(company); - }); - - return companyVos; - })(), - ispVos : (function () { - var ispVos = []; - - angular.forEach($scope.vm.ispVos, function (isp) { - ispVos.push(isp); - }); - - return ispVos; - })(), - hostingVos : (function () { - var hostingVos = []; - - angular.forEach($scope.vm.hostingVos, function (hosting) { - hostingVos.push(hosting); - }); - - return hostingVos; - })(), - // companyVos : parameter.companyVos, - // ispVos : parameter.ispVos, - // hostingVos : parameter.hostingVos, }; - Issue.sendEmail($resourceProvider.getContent( + Issue.sendEmailPartners($resourceProvider.getContent( content, $resourceProvider.getPageContent(0, 10))).then(function (result) { @@ -149,6 +121,5 @@ return deferred.promise; } - }]); }); -- Gitblit v1.8.0