From 6a0d01e645b7d388c851bc5b0b830564e60aa736 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 수, 01 12월 2021 16:44:28 +0900
Subject: [PATCH] 이메일 수정 진행중 , 이슈 상세 및 이슈 리스트 수정
---
src/main/webapp/scripts/app/issue/issueDetail.controller.js | 68 +++++++++++++++++++++++++---------
1 files changed, 50 insertions(+), 18 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueDetail.controller.js b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
index 955bfbb..3c41b1c 100644
--- a/src/main/webapp/scripts/app/issue/issueDetail.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
@@ -31,7 +31,12 @@
$scope.fn.modifyIssueUser = modifyIssueUser; // �씠�뒋 �떞�떦�옄 蹂�寃�
$scope.fn.modifyIssueDepartment = modifyIssueDepartment; // �씠�뒋 �떞�떦遺��꽌 蹂�寃�
$scope.fn.initReload = initReload; // 珥덇린�솕 �빐�빞�븷 �븷紐⑹쓣 吏��젙�븯�뿬 �떎瑜� �씠�뒋瑜� �겢由��븷 �븣 珥덇린�솕�빐以��떎.
- $scope.fn.sendMail = sendMail; // �듅�젙 �궗�슜�옄�뿉寃� �씠�뒋 �젙蹂대�� 硫붿씪濡� 諛쒖넚
+ $scope.fn.sendMail = sendMail;
+ $scope.fn.sendMailAll = sendMailAll;
+ $scope.fn.sendMailVo = sendMailVo;
+ $scope.fn.getParameters = getParameters;
+ $scope.fn.getParametersAll = getParametersAll;
+ // �듅�젙 �궗�슜�옄�뿉寃� �씠�뒋 �젙蹂대�� 硫붿씪濡� 諛쒖넚
$scope.fn.versionView = versionView; // 踰꾩쟾 �젙蹂대�� �몴�떆�븳�떎.
$scope.fn.reservation = reservation; // �삁�빟 �젙蹂대�� �솗�씤 諛� 蹂�寃� �븳�떎.
$scope.fn.getIssueListCallBack = getIssueListCallBack;
@@ -43,7 +48,6 @@
$scope.fn.getDownTableConfigs = getDownTableConfigs;
$scope.fn.containsPartner = containsPartner;
$scope.fn.onActivate = onActivate;
- $scope.fn.makePartnersEmail = makePartnersEmail;
// �씠�뒋 紐⑸줉 而⑦듃濡ㅻ윭 vm, fn �긽�냽 以�
$scope.vm.viewer = {};
@@ -1055,36 +1059,64 @@
});
}
- // �뾽泥�/ISP/�샇�뒪�똿 諛곗뿴媛믪쓣 �븯�굹濡� �빀爾먯꽌 硫붿씪 �겢由��떆 �쟾�떖
- function makePartnersEmail() {
- $scope.vm.form.partnersEmail = $scope.vm.viewer.issueCompanyVos.concat($scope.vm.viewer.issueIspVos, $scope.vm.viewer.issueHostingVos)
- return $scope.vm.form.partnersEmail;
+ function sendMailVo(partnerVos) {
+ $scope.fn.sendMail($scope.fn.getParametersAll(), $scope.fn.getParameters(null, partnerVos));
+ }
+
+ function sendMailAll() {
+ var param = $scope.fn.getParametersAll();
+ $scope.fn.sendMail(param, param);
}
// �듅�젙 �궗�슜�옄�뿉寃� �씠�뒋瑜� 硫붿씪濡� 諛쒖넚
- function sendMail(issueId, projectId) {
- makePartnersEmail();
+ function sendMail(partnersAll, partners) {
$uibModal.open({
templateUrl : 'views/issue/issueSendMail.html',
size : "md",
controller : 'issueSendMailController',
backdrop : 'static',
resolve : {
- parameter : function () {
- return {
- departmentVos : [$scope.vm.form.issues[0].departmentVos],
- partners : $scope.vm.form.partnersEmail,
- issueId : issueId,
- projectId : projectId
- // issueCompanyFields : [$scope.vm.viewer.issueCompanyVos[0]],
- // issueIspFields : [$scope.vm.viewer.issueIspVos[0]],
- // issueHostingFields : [$scope.vm.viewer.issueHostingVos[0]],
- };
+ parameter : {
+ partnersAll : partnersAll,
+ partners : partners,
+ issueId : $scope.vm.viewer.id,
+ projectId : $scope.vm.viewer.projectVo.id,
+ ispVos : $scope.vm.viewer.ispVos,
+ hosingVos : $scope.vm.viewer.hosingVos,
+ companyVos : $scope.vm.viewer.companyVos,
}
}
});
}
+ function getParametersAll() {
+ var params = $scope.fn.getParameters(null, $scope.vm.viewer.issueCompanyVos);
+ params = $scope.fn.getParameters(params, $scope.vm.viewer.issueIspVos);
+ params = $scope.fn.getParameters(params, $scope.vm.viewer.issueHostingVos);
+
+ if (params != null && params.length > 0) {
+ for (let i = 0; i < params.length; i++) {
+ params[i].id = i;
+ }
+ }
+ return params;
+ }
+
+ function getParameters(sourceArr, partnerVos) {
+ var excludeVos = sourceArr != null ? sourceArr.slice() : [];
+
+ angular.forEach(partnerVos, function (vo) {
+ var account = {
+ account : vo.email
+ }
+ Object.assign(vo, account)
+
+ excludeVos.push(vo);
+ });
+
+ return excludeVos;
+ }
+
// 蹂�寃� �젙蹂대�� �솗�씤�븳�떎.
function versionView(issueId) {
$uibModal.open({
--
Gitblit v1.8.0