From 5fb1952ae91f1a739803247266e87dbd15ea1f27 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 01 12월 2021 13:23:09 +0900
Subject: [PATCH] 충돌 수정
---
src/main/webapp/scripts/app/issue/issueSendMail.controller.js | 82 +++++++++++++++++++++++++++++++++--------
1 files changed, 66 insertions(+), 16 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueSendMail.controller.js b/src/main/webapp/scripts/app/issue/issueSendMail.controller.js
index 29e991e..3643b48 100644
--- a/src/main/webapp/scripts/app/issue/issueSendMail.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueSendMail.controller.js
@@ -13,49 +13,63 @@
removeManager : removeManager, // �쟾�넚 ���긽�옄 �궘�젣
cancel : cancel, // �뙘�뾽 李� �떕湲�
formSubmit : formSubmit, // �뤌 �쟾�넚
- formCheck : formCheck // �뤌 泥댄겕
+ // formCheck : formCheck // �뤌 泥댄겕
};
+
$scope.vm = {
form : {
id : parameter.issueId, // �씠�뒋 踰덊샇
projects : [{ id : parameter.projectId}], // �봽濡쒖젥�듃
- users : [] // 硫붿씪 �쟾�넚諛쏅뒗 �궗�슜�옄
+ partners : parameter.partners,
+ users : [], // 硫붿씪 �쟾�넚諛쏅뒗 �궗�슜�옄
+ issueCompanyVos : [],
+ issueIspVos : [],
+ issueHostingVos : []
+ // companyFields : parameter.issueCompanyFields, // �뾽泥� �씠硫붿씪
+ // ispFields : parameter.issueIspFields, // ISP �씠硫붿씪
+ // hostingFields : parameter.issueHostingFields, // �샇�뒪�똿 �씠硫붿씪
},
userName : "",
+ partnerName : "",
autoCompletePage : {
user : {
page : 0,
totalPage : 0
+ },
+ partnersMail : {
+ page : 0,
+ totalPage :0
}
}
};
+
+
angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector}));
- function formCheck(formInvalid) {
- if (formInvalid) {
- return true;
- }
-
- if ($scope.vm.form.users.length < 1) {
- return true;
- }
-
- return false;
- }
+ // function formCheck(formInvalid) {
+ // if (formInvalid) {
+ // return true;
+ // }
+ //
+ // if ($scope.vm.form.users.length < 1) {
+ // return true;
+ // }
+ //
+ // return false;
+ // }
// �뤌 �쟾�넚
function formSubmit() {
$rootScope.spinner = true;
-
var content = {
id : $scope.vm.form.id,
sendEmails : (function () {
var sendEmails = [];
- angular.forEach($scope.vm.form.users, function (user) {
- sendEmails.push($rootScope.encryption(user.account));
+ angular.forEach($scope.vm.form.projects, function (project) {
+ sendEmails.push(project.id);
});
return sendEmails;
@@ -78,6 +92,42 @@
});
}
+ // function formSubmit() {
+ // $rootScope.spinner = true;
+ //
+ // var content = {
+ // id : $scope.vm.form.id,
+ // companyFieldsEmail : $scope.vm.form.companyFieldsEmail,
+ // ispFieldsEmail : $scope.vm.form.ispFieldsEmail,
+ // hostingFieldsEmail : $scope.vm.form.hostingFieldsEmail,
+ // sendEmails : (function () {
+ // var sendEmails = [];
+ //
+ // angular.forEach($scope.vm.form.projects, function (project) {
+ // sendEmails.push(project.id);
+ // });
+ //
+ // return sendEmails;
+ // })()
+ // };
+ //
+ // Issue.findMailTargetAll($resourceProvider.getContent(
+ // content,
+ // $resourceProvider.getPageContent(0, 10))).then(function (result) {
+ //
+ // if (result.data.message.status === "success") {
+ // SweetAlert.success($filter("translate")("issue.succeededIssueMail"), $filter("translate")("issue.sentToTheSelectedUser")); // "�씠�뒋 硫붿씪 諛쒖넚 �셿猷�"
+ // $scope.fn.cancel();
+ // }
+ // else {
+ // SweetAlert.error($filter("translate")("issue.failedIssueMail"), result.data.message.message); // "�씠�뒋 硫붿씪 諛쒖넚 �떎�뙣"
+ // }
+ //
+ // $rootScope.spinner = false;
+ // });
+ // }
+
+
// �궗�슜�옄 auto complete callback function
function getUserListCallBack(result) {
$scope.vm.autoCompletePage.user.totalPage = result.data.page.totalPage;
--
Gitblit v1.8.0