From 8d1928e733f71e00c6d8685d4f5b15031f4afa38 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 18 2월 2022 12:54:27 +0900
Subject: [PATCH] 파트너정보 상속여부 확인 알림 코드 수정
---
src/main/webapp/scripts/app/issue/issueAddDown.controller.js | 73 +++-
src/main/java/kr/wisestone/owl/web/controller/IssueController.java | 1
src/main/webapp/scripts/app/issue/issueImportExcel.controller.js | 130 +++++---
src/main/webapp/scripts/app/issue/issueModify.controller.js | 666 +++++++++++++++++++++++--------------------
4 files changed, 486 insertions(+), 384 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/web/controller/IssueController.java b/src/main/java/kr/wisestone/owl/web/controller/IssueController.java
index a9fec9d..90fa933 100644
--- a/src/main/java/kr/wisestone/owl/web/controller/IssueController.java
+++ b/src/main/java/kr/wisestone/owl/web/controller/IssueController.java
@@ -80,6 +80,7 @@
this.issueService.addIssueVersion(issue.getId());
resJsonData.put(Constants.RES_KEY_CONTENTS, issue.getId()); //�븯�쐞�씠�뒋 ID
+ resJsonData.put(Constants.REQ_KEY_CONTENT, issue.getIssueType().getInheritPartners()); //�긽�냽 �뿬遺�
return this.setSuccessMessage(resJsonData);
}
diff --git a/src/main/webapp/scripts/app/issue/issueAddDown.controller.js b/src/main/webapp/scripts/app/issue/issueAddDown.controller.js
index 3e1c6d0..8d58bbe 100644
--- a/src/main/webapp/scripts/app/issue/issueAddDown.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAddDown.controller.js
@@ -843,9 +843,7 @@
}).then(function (result) {
if (result.data.message.status === "success") {
- $scope.fn.addDownIssue(result.data.data);
-
- $scope.fn.cancel();
+ $scope.fn.addDownIssue(result.data.data, result.data.content);
// �씠�뒋 �긽�꽭 �솕硫� �슂泥�
$rootScope.$broadcast("getIssueDetail", {
@@ -862,29 +860,56 @@
}
// �븯�쐞 �씠�뒋 異붽�
- function addDownIssue(downId) {
+ function addDownIssue(downId, inheritYn) {
+ $rootScope.spinner = true;
+
var ids = [];
- let inheritYn = false;
+ if (downId != null) {
+ ids.push(downId);
+ }
- SweetAlert.swal({
- title : $filter("translate")("issue.addDownIssue"), // �븯�쐞 �씠�뒋 異붽�
- text : $filter("translate")("issue.wantToInheritPartnersOfParentIssue"), // �긽�쐞�씠�뒋�쓽 �뙆�듃�꼫 �젙蹂�(�뾽泥�/ISP/�샇�뒪�똿)瑜� �쟻�슜�떆�궎寃좎뒿�땲源�?
- type : "warning",
- showCancelButton : true,
- confirmButtonColor : "#DD6B55",
- confirmButtonText : $filter("translate")("common.ok"), // �꽕
- cancelButtonText : $filter("translate")("common.no"), // �븘�땲�삤
- closeOnConfirm : false,
- closeOnCancel : false
- },
- function (isConfirm) {
- if (isConfirm) {
- inheritYn = true;
- }
+ if ($rootScope.isDefined(inheritYn) && inheritYn) {
+ SweetAlert.swal({
+ title : $filter("translate")("issue.addDownIssue"), // �븯�쐞 �씠�뒋 異붽�
+ text : $filter("translate")("issue.wantToInheritPartnersOfParentIssue"), // �긽�쐞�씠�뒋�쓽 �뙆�듃�꼫 �젙蹂�(�뾽泥�/ISP/�샇�뒪�똿)瑜� �쟻�슜�떆�궎寃좎뒿�땲源�?
+ type : "warning",
+ showCancelButton : true,
+ confirmButtonColor : "#DD6B55",
+ confirmButtonText : $filter("translate")("common.ok"), // �꽕
+ cancelButtonText : $filter("translate")("common.no"), // �븘�땲�삤
+ closeOnConfirm : false,
+ closeOnCancel : false
+ },
+ function (isConfirm) {
+ if (!isConfirm) {
+ inheritYn = false;
+ }
- if (downId != null) {
- ids.push(downId);
- }
+ var contents = {
+ issueId : parameter.id,
+ ids : ids,
+ parentIssueId : parameter.id,
+ inheritYn : inheritYn
+ };
+
+ Issue.modifyParentIssue($resourceProvider.getContent(
+ contents,
+ $resourceProvider.getPageContent(0, 10))).then(function (result) {
+
+ if (result.data.message.status === "success") {
+ $scope.fn.cancel();
+ // �씠�뒋 �긽�꽭 �솕硫� �슂泥�
+ $rootScope.$broadcast("getIssueDetail", {
+ id : parameter.id
+ });
+ }
+ else {
+ SweetAlert.error($filter("translate")("issue.failedToIssueAddIssueDown"), result.data.message.message); // "�븯�쐞�씠�뒋 �깮�꽦 �떎�뙣"
+ }
+ $rootScope.spinner = false;
+ });
+ });
+ } else {
var contents = {
issueId : parameter.id,
@@ -908,7 +933,7 @@
SweetAlert.error($filter("translate")("issue.failedToIssueAddIssueDown"), result.data.message.message); // "�븯�쐞�씠�뒋 �깮�꽦 �떎�뙣"
}
});
- });
+ }
}
// �뙘�뾽 李� �떕湲�
diff --git a/src/main/webapp/scripts/app/issue/issueImportExcel.controller.js b/src/main/webapp/scripts/app/issue/issueImportExcel.controller.js
index 4e88978..c8b8c52 100644
--- a/src/main/webapp/scripts/app/issue/issueImportExcel.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueImportExcel.controller.js
@@ -128,56 +128,94 @@
if ($scope.vm.form.issues[0].inheritPartners != null && $scope.vm.form.issues[0].inheritPartners === true) {
SweetAlert.swal({
- title : $filter("translate")("issue.addDownIssue"), // �븯�쐞 �씠�뒋 異붽�
- text : $filter("translate")("issue.wantToInheritPartnersOfParentIssue"), // �긽�쐞�씠�뒋�쓽 �뙆�듃�꼫 �젙蹂�(�뾽泥�/ISP/�샇�뒪�똿)瑜� �쟻�슜�떆�궎寃좎뒿�땲源�?
- type : "warning",
- showCancelButton : true,
- confirmButtonColor : "#DD6B55",
- confirmButtonText : $filter("translate")("common.ok"), // �꽕
- cancelButtonText : $filter("translate")("common.no"), // �븘�땲�삤
- closeOnConfirm : false,
- closeOnCancel : false
- },
- function (isConfirm) {
- if (isConfirm) {
- inheritYn = true;
- }
- Issue.importExcel({
- method : "POST",
- file : $scope.vm.form.file,
- // data �냽�꽦�쑝濡� 蹂꾨룄�쓽 �뜲�씠�꽣 �쟾�넚
- fields : {
- content : {
- projectId : $scope.vm.form.projects[0].id,
- issueTypeId : $scope.vm.form.issueTypeId,
- parentIssueId : (function () {
- let id = -1;
- if ($rootScope.isDefined($scope.vm.form.issues)) {
- if ($rootScope.isDefined($scope.vm.form.issues[0])) {
- id = $scope.vm.form.issues[0].id;
- }
+ title : $filter("translate")("issue.addDownIssue"), // �븯�쐞 �씠�뒋 異붽�
+ text : $filter("translate")("issue.wantToInheritPartnersOfParentIssue"), // �긽�쐞�씠�뒋�쓽 �뙆�듃�꼫 �젙蹂�(�뾽泥�/ISP/�샇�뒪�똿)瑜� �쟻�슜�떆�궎寃좎뒿�땲源�?
+ type : "warning",
+ showCancelButton : true,
+ confirmButtonColor : "#DD6B55",
+ confirmButtonText : $filter("translate")("common.ok"), // �꽕
+ cancelButtonText : $filter("translate")("common.no"), // �븘�땲�삤
+ closeOnConfirm : false,
+ closeOnCancel : false
+ },
+ function (isConfirm) {
+ if (isConfirm) {
+ inheritYn = true;
+ }
+ SweetAlert.close();
+
+ Issue.importExcel({
+ method : "POST",
+ file : $scope.vm.form.file,
+ // data �냽�꽦�쑝濡� 蹂꾨룄�쓽 �뜲�씠�꽣 �쟾�넚
+ fields : {
+ content : {
+ projectId : $scope.vm.form.projects[0].id,
+ issueTypeId : $scope.vm.form.issueTypeId,
+ parentIssueId : (function () {
+ let id = -1;
+ if ($rootScope.isDefined($scope.vm.form.issues)) {
+ if ($rootScope.isDefined($scope.vm.form.issues[0])) {
+ id = $scope.vm.form.issues[0].id;
}
- return id;
- })(),
- inheritYn : inheritYn
- }
- },
- fileFormDataName : "file",
- }).then(function (result) {
- if (result.data.message.status === "success") {
- $timeout(function () {
- SweetAlert.success($filter("translate")("issue.succeededIssueRegistration"), result.data.message.message); // �씠�뒋 �벑濡� �꽦怨�
- $scope.fn.cancel();
- $rootScope.$broadcast("getIssueList");
- $rootScope.spinner = false;
- }, 1000);
+ }
+ return id;
+ })(),
+ inheritYn : inheritYn
}
- else {
- SweetAlert.error($filter("translate")("issue.failedIssueRegistration"), result.data.message.message); // �씠�뒋 �벑濡� �떎�뙣
+ },
+ fileFormDataName : "file",
+ }).then(function (result) {
+ if (result.data.message.status === "success") {
+ $timeout(function () {
+ SweetAlert.success($filter("translate")("issue.succeededIssueRegistration"), result.data.message.message); // �씠�뒋 �벑濡� �꽦怨�
+ $scope.fn.cancel();
+ $rootScope.$broadcast("getIssueList");
$rootScope.spinner = false;
- }
- });
+ }, 1000);
+ }
+ else {
+ SweetAlert.error($filter("translate")("issue.failedIssueRegistration"), result.data.message.message); // �씠�뒋 �벑濡� �떎�뙣
+ $rootScope.spinner = false;
+ }
});
+ });
+ } else {
+ Issue.importExcel({
+ method : "POST",
+ file : $scope.vm.form.file,
+ // data �냽�꽦�쑝濡� 蹂꾨룄�쓽 �뜲�씠�꽣 �쟾�넚
+ fields : {
+ content : {
+ projectId : $scope.vm.form.projects[0].id,
+ issueTypeId : $scope.vm.form.issueTypeId,
+ parentIssueId : (function () {
+ let id = -1;
+ if ($rootScope.isDefined($scope.vm.form.issues)) {
+ if ($rootScope.isDefined($scope.vm.form.issues[0])) {
+ id = $scope.vm.form.issues[0].id;
+ }
+ }
+ return id;
+ })(),
+ inheritYn : inheritYn
+ }
+ },
+ fileFormDataName : "file",
+ }).then(function (result) {
+ if (result.data.message.status === "success") {
+ $timeout(function () {
+ SweetAlert.success($filter("translate")("issue.succeededIssueRegistration"), result.data.message.message); // �씠�뒋 �벑濡� �꽦怨�
+ $scope.fn.cancel();
+ $rootScope.$broadcast("getIssueList");
+ $rootScope.spinner = false;
+ }, 1000);
+ }
+ else {
+ SweetAlert.error($filter("translate")("issue.failedIssueRegistration"), result.data.message.message); // �씠�뒋 �벑濡� �떎�뙣
+ $rootScope.spinner = false;
+ }
+ });
}
}
diff --git a/src/main/webapp/scripts/app/issue/issueModify.controller.js b/src/main/webapp/scripts/app/issue/issueModify.controller.js
index 1ebad33..8bf3780 100644
--- a/src/main/webapp/scripts/app/issue/issueModify.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueModify.controller.js
@@ -579,324 +579,362 @@
$rootScope.spinner = true;
let inheritYn = false;
- if ($scope.vm.inheritPartners && $scope.vm.downTotalCount > 0) {
- SweetAlert.swal({
- title : $filter("translate")("issue.modifyDownIssue"), // �븯�쐞 �씠�뒋 蹂�寃�
- text : $filter("translate")("issue.wantToInheritPartnersOfParentIssue"), // �긽�쐞�씠�뒋�쓽 �뙆�듃�꼫 �젙蹂�(�뾽泥�/ISP/�샇�뒪�똿)瑜� �쟻�슜�떆�궎寃좎뒿�땲源�?
- type : "warning",
- showCancelButton : true,
- confirmButtonColor : "#DD6B55",
- confirmButtonText : $filter("translate")("common.ok"), // �꽕
- cancelButtonText : $filter("translate")("common.no"), // �븘�땲�삤
- closeOnConfirm : false,
- closeOnCancel : false
- },
- function (isConfirm) {
- if (isConfirm) {
- inheritYn = true;
+
+ var content = {
+ id : parameter.id,
+ title : $rootScope.preventXss($scope.vm.form.title), // �젣紐�
+ description : $rootScope.preventXss($scope.vm.form.description), // �궡�슜
+ inheritYn : inheritYn,
+ companyName : $scope.vm.companyName,
+ companyManager : $scope.vm.companyManager,
+ companyTel : $scope.vm.companyTel,
+ companyEmail :$scope.vm.companyEmail,
+ companyUrl : $scope.vm.companyUrl,
+ companyMemo : $scope.vm.companyMemo,
+
+ companyTypeId : (function () {
+ var companyTypeId = null;
+ if ($scope.vm.form.companyTypes != null && $scope.vm.form.companyTypes.length > 0) {
+ companyTypeId = $scope.vm.form.companyTypes[0].id;
+ } else {
+ companyTypeId = $scope.vm.form.companyTypeId;
+ }
+ return companyTypeId;
+ })(),
+ parentSectorId : (function () {
+ var parentSectorId = null;
+ if ($scope.vm.form.parentSectors != null && $scope.vm.form.parentSectors.length > 0) {
+ parentSectorId = $scope.vm.form.parentSectors[0].id;
+ } else {
+ parentSectorId = $scope.vm.form.parentSectorId;
+ }
+ return parentSectorId;
+ })(),
+ childSectorId : (function () {
+ var childSectorId = null;
+ if ($scope.vm.form.childSectors != null && $scope.vm.form.childSectors.length > 0) {
+ childSectorId = $scope.vm.form.childSectors[0].id;
+ } else {
+ childSectorId = $scope.vm.form.childSectorId;
+ }
+ return childSectorId;
+ })(),
+ regionId : (function () {
+ var regionId = null;
+ if ($scope.vm.form.regions != null && $scope.vm.form.regions.length > 0) {
+ regionId = $scope.vm.form.regions[0].id;
+ } else {
+ regionId = $scope.vm.form.regionId;
+ }
+ return regionId;
+ })(),
+ statusId : (function () {
+ var statusId = null;
+ if ($scope.vm.form.statuses != null && $scope.vm.form.statuses.length > 0) {
+ statusId = $scope.vm.form.statuses[0].id;
+ } else {
+ statusId = $scope.vm.form.statusId;
+ }
+ return statusId;
+ })(),
+ statusName : $scope.vm.form.status,
+
+ ispName : $scope.vm.ispName,
+ ispCode : $scope.vm.ispCode,
+ ispManager : $scope.vm.ispManager,
+ ispTel : $scope.vm.ispTel,
+ ispEmail : $scope.vm.ispEmail,
+ ispUrl : $scope.vm.ispUrl,
+ ispMemo : $scope.vm.ispMemo,
+ hostingName : $scope.vm.hostingName,
+ hostingCode : $scope.vm.hostingCode,
+ hostingManager : $scope.vm.hostingManager,
+ hostingTel : $scope.vm.hostingTel,
+ hostingEmail : $scope.vm.hostingEmail,
+ hostingUrl : $scope.vm.hostingUrl,
+ hostingMemo : $scope.vm.hostingMemo,
+
+ projectId : (function () { // �봽濡쒖젥�듃 �븘�씠�뵒
+ var projectId = "";
+
+ if ($scope.vm.form.projects.length > 0) {
+ projectId = $scope.vm.form.projects[0].id;
+ }
+
+ return projectId;
+ })(),
+
+ issueTypeId : $scope.vm.form.issueTypeId, // �씠�뒋 �쑀�삎 �븘�씠�뵒
+ priorityId : $scope.vm.form.priorityId, // �슦�꽑�닚�쐞 �븘�씠�뵒
+ severityId : $scope.vm.form.severityId, // 以묒슂�룄 �븘�씠�뵒
+ issueStatusId : $scope.vm.form.issueStatusId, // �씠�뒋 �긽�깭 �븘�씠�뵒
+
+ companyId : (function () {
+ var companyId = null;
+
+ if ($scope.vm.form.issueCompanyFields != null && $scope.vm.form.issueCompanyFields.length > 0) {
+ companyId = $scope.vm.form.issueCompanyFields[0].id;
+ }
+
+ return companyId;
+ }),
+
+ ispId : (function () {
+ var ispId = null;
+
+ if ($scope.vm.form.issueIspFields != null && $scope.vm.form.issueIspFields.length > 0) {
+ ispId = $scope.vm.form.issueIspFields[0].id;
+ }
+
+ return ispId;
+ }),
+
+ hostingId : (function () {
+ var hostingId = null;
+
+ if ($scope.vm.form.issueHostingFields != null && $scope.vm.form.issueHostingFields.length > 0) {
+ hostingId = $scope.vm.form.issueHostingFields[0].id;
+ }
+
+ return hostingId;
+ }),
+
+ userIds : (function () {
+ var userIds = [];
+
+ angular.forEach($scope.vm.form.users, function (user) {
+ userIds.push(user.id);
+ });
+
+ return userIds;
+ })(),
+ departmentIds : (function () {
+ var departmentIds = [];
+
+ angular.forEach($scope.vm.form.departments, function (department) {
+ departmentIds.push(department.id);
+ });
+
+ return departmentIds;
+ })(),
+
+ attachedFileIds : (function () {
+ var attachedFileIds = [];
+
+ angular.forEach($scope.vm.form.attachedFiles, function (attachedFile) {
+ if ($scope.vm.form.description.indexOf(attachedFile.path) !== -1) {
+ attachedFileIds.push(attachedFile.id);
+ }
+ });
+
+ return attachedFileIds;
+ })(),
+
+ issueCompanyFields : (function () {
+ var issueCompanyFields = [];
+ if ($scope.vm.form.issueCompanyFields != null && $scope.vm.form.issueCompanyFields.length > 0 ){
+
+ var companyField = $scope.vm.form.issueCompanyFields[0];
+ //�궗�슜�옄媛� 吏곸젒 �뾽泥� 異붽� �븷 寃쎌슦
+ if ($rootScope.isDefined(companyField) && companyField.name !== $scope.vm.companyName) {
+ return issueCompanyFields;
}
- var content = {
- id : parameter.id,
- title : $rootScope.preventXss($scope.vm.form.title), // �젣紐�
- description : $rootScope.preventXss($scope.vm.form.description), // �궡�슜
- inheritYn : inheritYn,
- companyName : $scope.vm.companyName,
- companyManager : $scope.vm.companyManager,
- companyTel : $scope.vm.companyTel,
- companyEmail :$scope.vm.companyEmail,
- companyUrl : $scope.vm.companyUrl,
- companyMemo : $scope.vm.companyMemo,
-
- companyTypeId : (function () {
- var companyTypeId = null;
- if ($scope.vm.form.companyTypes != null && $scope.vm.form.companyTypes.length > 0) {
- companyTypeId = $scope.vm.form.companyTypes[0].id;
- } else {
- companyTypeId = $scope.vm.form.companyTypeId;
- }
- return companyTypeId;
- })(),
- parentSectorId : (function () {
- var parentSectorId = null;
- if ($scope.vm.form.parentSectors != null && $scope.vm.form.parentSectors.length > 0) {
- parentSectorId = $scope.vm.form.parentSectors[0].id;
- } else {
- parentSectorId = $scope.vm.form.parentSectorId;
- }
- return parentSectorId;
- })(),
- childSectorId : (function () {
- var childSectorId = null;
- if ($scope.vm.form.childSectors != null && $scope.vm.form.childSectors.length > 0) {
- childSectorId = $scope.vm.form.childSectors[0].id;
- } else {
- childSectorId = $scope.vm.form.childSectorId;
- }
- return childSectorId;
- })(),
- regionId : (function () {
- var regionId = null;
- if ($scope.vm.form.regions != null && $scope.vm.form.regions.length > 0) {
- regionId = $scope.vm.form.regions[0].id;
- } else {
- regionId = $scope.vm.form.regionId;
- }
- return regionId;
- })(),
- statusId : (function () {
- var statusId = null;
- if ($scope.vm.form.statuses != null && $scope.vm.form.statuses.length > 0) {
- statusId = $scope.vm.form.statuses[0].id;
- } else {
- statusId = $scope.vm.form.statusId;
- }
- return statusId;
- })(),
- statusName : $scope.vm.form.status,
-
- ispName : $scope.vm.ispName,
- ispCode : $scope.vm.ispCode,
- ispManager : $scope.vm.ispManager,
- ispTel : $scope.vm.ispTel,
- ispEmail : $scope.vm.ispEmail,
- ispUrl : $scope.vm.ispUrl,
- ispMemo : $scope.vm.ispMemo,
- hostingName : $scope.vm.hostingName,
- hostingCode : $scope.vm.hostingCode,
- hostingManager : $scope.vm.hostingManager,
- hostingTel : $scope.vm.hostingTel,
- hostingEmail : $scope.vm.hostingEmail,
- hostingUrl : $scope.vm.hostingUrl,
- hostingMemo : $scope.vm.hostingMemo,
-
- projectId : (function () { // �봽濡쒖젥�듃 �븘�씠�뵒
- var projectId = "";
-
- if ($scope.vm.form.projects.length > 0) {
- projectId = $scope.vm.form.projects[0].id;
- }
-
- return projectId;
- })(),
-
- issueTypeId : $scope.vm.form.issueTypeId, // �씠�뒋 �쑀�삎 �븘�씠�뵒
- priorityId : $scope.vm.form.priorityId, // �슦�꽑�닚�쐞 �븘�씠�뵒
- severityId : $scope.vm.form.severityId, // 以묒슂�룄 �븘�씠�뵒
- issueStatusId : $scope.vm.form.issueStatusId, // �씠�뒋 �긽�깭 �븘�씠�뵒
-
- companyId : (function () {
- var companyId = null;
-
- if ($scope.vm.form.issueCompanyFields != null && $scope.vm.form.issueCompanyFields.length > 0) {
- companyId = $scope.vm.form.issueCompanyFields[0].id;
- }
-
- return companyId;
- }),
-
- ispId : (function () {
- var ispId = null;
-
- if ($scope.vm.form.issueIspFields != null && $scope.vm.form.issueIspFields.length > 0) {
- ispId = $scope.vm.form.issueIspFields[0].id;
- }
-
- return ispId;
- }),
-
- hostingId : (function () {
- var hostingId = null;
-
- if ($scope.vm.form.issueHostingFields != null && $scope.vm.form.issueHostingFields.length > 0) {
- hostingId = $scope.vm.form.issueHostingFields[0].id;
- }
-
- return hostingId;
- }),
-
- userIds : (function () {
- var userIds = [];
-
- angular.forEach($scope.vm.form.users, function (user) {
- userIds.push(user.id);
- });
-
- return userIds;
- })(),
- departmentIds : (function () {
- var departmentIds = [];
-
- angular.forEach($scope.vm.form.departments, function (department) {
- departmentIds.push(department.id);
- });
-
- return departmentIds;
- })(),
-
- attachedFileIds : (function () {
- var attachedFileIds = [];
-
- angular.forEach($scope.vm.form.attachedFiles, function (attachedFile) {
- if ($scope.vm.form.description.indexOf(attachedFile.path) !== -1) {
- attachedFileIds.push(attachedFile.id);
- }
- });
-
- return attachedFileIds;
- })(),
-
- issueCompanyFields : (function () {
- var issueCompanyFields = [];
- if ($scope.vm.form.issueCompanyFields != null && $scope.vm.form.issueCompanyFields.length > 0 ){
-
- var companyField = $scope.vm.form.issueCompanyFields[0];
- //�궗�슜�옄媛� 吏곸젒 �뾽泥� 異붽� �븷 寃쎌슦
- if ($rootScope.isDefined(companyField) && companyField.name !== $scope.vm.companyName) {
- return issueCompanyFields;
- }
-
- issueCompanyFields.push({
- id : companyField.id,
- companyId : $scope.vm.companyId,
- name : $scope.vm.companyName,
- manager : $scope.vm.companyManager,
- tel : $scope.vm.companyTel,
- email :$scope.vm.companyEmail,
- url :$scope.vm.companyUrl,
- memo : $scope.vm.companyMemo,
- companyTypeId : $scope.vm.form.companyTypeId,
- parentSectorId : $scope.vm.form.parentSectorId,
- childSectorId : $scope.vm.form.childSectorId,
- regionId : $scope.vm.form.regionId,
- statusId : $scope.vm.form.statusId,
- statusName : $scope.vm.form.status
- });
- }
-
- return issueCompanyFields;
- })(),
-
- issueIspFields : (function () {
- var issueIspFields = [];
- if ($scope.vm.form.issueCompanyFields != null && $scope.vm.form.issueCompanyFields.length > 0
- && $scope.vm.form.issueCompanyFields[0].ispFieldVo != null
- || $scope.vm.form.issueIspFields != null && $scope.vm.form.issueIspFields.length > 0 ){
-
- var ispField = $scope.vm.form.issueIspFields[0];
- //�궗�슜�옄媛� 吏곸젒 ISP 異붽� �븷 寃쎌슦
- if ($rootScope.isDefined(ispField) && ispField.name !== $scope.vm.ispName) {
- return issueIspFields;
- }
-
- issueIspFields.push({
- ispId : $scope.vm.ispId,
- code : $scope.vm.ispCode,
- name : $scope.vm.ispName,
- manager : $scope.vm.ispManager,
- tel : $scope.vm.ispTel,
- email :$scope.vm.ispEmail,
- url :$scope.vm.ispUrl,
- memo : $scope.vm.ispMemo
- });
-
- }
-
- return issueIspFields;
- })(),
-
- issueHostingFields : (function () {
- var issueHostingFields = [];
- if ($scope.vm.form.issueCompanyFields != null && $scope.vm.form.issueCompanyFields.length > 0
- && $scope.vm.form.issueCompanyFields[0].hostingFieldVo != null
- || $scope.vm.form.issueHostingFields != null && $scope.vm.form.issueHostingFields.length > 0 ){
-
- var hostingField = $scope.vm.form.issueHostingFields[0];
- //�궗�슜�옄媛� 吏곸젒 �샇�뒪�똿 異붽� �븷 寃쎌슦
- if ($rootScope.isDefined(hostingField) && hostingField.name !== $scope.vm.hostingName) {
- return issueHostingFields;
- }
-
- issueHostingFields.push({
- hostingId : $scope.vm.hostingId,
- name : $scope.vm.hostingName,
- code : $scope.vm.hostingCode,
- manager : $scope.vm.hostingManager,
- tel : $scope.vm.hostingTel,
- email :$scope.vm.hostingEmail,
- url :$scope.vm.hostingUrl,
- memo : $scope.vm.hostingMemo
- });
- }
-
- return issueHostingFields;
- })(),
-
- removeFiles : $scope.vm.form.removeFiles,
- startCompleteDateRange : $scope.vm.form.startCompleteDateRange,
-
- issueCustomFields : (function () { // �씠�뒋�뿉�꽌 �궗�슜�릺�뒗 �궗�슜�옄 �젙�쓽 �븘�뱶
- var issueCustomFields = [];
-
- angular.forEach($scope.vm.form.issueCustomFields, function (issueCustomField) {
- var useValues = [];
-
- if (angular.isArray(issueCustomField.useValues)) {
- angular.forEach(issueCustomField.useValues, function (useValue) {
- useValues.push(useValue.value);
- });
- }
- else {
- useValues.push(issueCustomField.useValues);
- }
-
- // useValues 瑜� 諛곗뿴濡� 蹂��솚�븳�떎.
- var temp = angular.copy(issueCustomField);
- temp.useValues = useValues;
- issueCustomFields.push(temp);
- });
-
- return issueCustomFields;
- })()
- };
-
- Issue.modify({
- method : "POST",
- file : (function () {
- var files = [];
-
- angular.forEach($scope.vm.form.files, function (file) {
- if (angular.isUndefined(file.id)) {
- files.push(file);
- }
- });
-
- return files;
- })(),
- // data �냽�꽦�쑝濡� 蹂꾨룄�쓽 �뜲�씠�꽣 �쟾�넚
- fields : {
- content : content
- },
- fileFormDataName : "file"
- }).then(function (result) {
-
- if (result.data.message.status === "success") {
- $scope.fn.cancel();
-
- // �씠�뒋 �긽�꽭 �솕硫� �슂泥�
- $rootScope.$broadcast("getIssueDetail", {
- id : parameter.id
- });
-
- $rootScope.$broadcast("getIssueList");
- }
- else {
- SweetAlert.error($filter("translate")("issue.failedIssueModify"), result.data.message.message); // �씠�뒋 �닔�젙 �떎�뙣
- }
-
- $rootScope.spinner = false;
+ issueCompanyFields.push({
+ id : companyField.id,
+ companyId : $scope.vm.companyId,
+ name : $scope.vm.companyName,
+ manager : $scope.vm.companyManager,
+ tel : $scope.vm.companyTel,
+ email :$scope.vm.companyEmail,
+ url :$scope.vm.companyUrl,
+ memo : $scope.vm.companyMemo,
+ companyTypeId : $scope.vm.form.companyTypeId,
+ parentSectorId : $scope.vm.form.parentSectorId,
+ childSectorId : $scope.vm.form.childSectorId,
+ regionId : $scope.vm.form.regionId,
+ statusId : $scope.vm.form.statusId,
+ statusName : $scope.vm.form.status
});
+ }
+
+ return issueCompanyFields;
+ })(),
+
+ issueIspFields : (function () {
+ var issueIspFields = [];
+ if ($scope.vm.form.issueCompanyFields != null && $scope.vm.form.issueCompanyFields.length > 0
+ && $scope.vm.form.issueCompanyFields[0].ispFieldVo != null
+ || $scope.vm.form.issueIspFields != null && $scope.vm.form.issueIspFields.length > 0 ){
+
+ var ispField = $scope.vm.form.issueIspFields[0];
+ //�궗�슜�옄媛� 吏곸젒 ISP 異붽� �븷 寃쎌슦
+ if ($rootScope.isDefined(ispField) && ispField.name !== $scope.vm.ispName) {
+ return issueIspFields;
+ }
+
+ issueIspFields.push({
+ ispId : $scope.vm.ispId,
+ code : $scope.vm.ispCode,
+ name : $scope.vm.ispName,
+ manager : $scope.vm.ispManager,
+ tel : $scope.vm.ispTel,
+ email :$scope.vm.ispEmail,
+ url :$scope.vm.ispUrl,
+ memo : $scope.vm.ispMemo
+ });
+
+ }
+
+ return issueIspFields;
+ })(),
+
+ issueHostingFields : (function () {
+ var issueHostingFields = [];
+ if ($scope.vm.form.issueCompanyFields != null && $scope.vm.form.issueCompanyFields.length > 0
+ && $scope.vm.form.issueCompanyFields[0].hostingFieldVo != null
+ || $scope.vm.form.issueHostingFields != null && $scope.vm.form.issueHostingFields.length > 0 ){
+
+ var hostingField = $scope.vm.form.issueHostingFields[0];
+ //�궗�슜�옄媛� 吏곸젒 �샇�뒪�똿 異붽� �븷 寃쎌슦
+ if ($rootScope.isDefined(hostingField) && hostingField.name !== $scope.vm.hostingName) {
+ return issueHostingFields;
+ }
+
+ issueHostingFields.push({
+ hostingId : $scope.vm.hostingId,
+ name : $scope.vm.hostingName,
+ code : $scope.vm.hostingCode,
+ manager : $scope.vm.hostingManager,
+ tel : $scope.vm.hostingTel,
+ email :$scope.vm.hostingEmail,
+ url :$scope.vm.hostingUrl,
+ memo : $scope.vm.hostingMemo
+ });
+ }
+
+ return issueHostingFields;
+ })(),
+
+ removeFiles : $scope.vm.form.removeFiles,
+ startCompleteDateRange : $scope.vm.form.startCompleteDateRange,
+
+ issueCustomFields : (function () { // �씠�뒋�뿉�꽌 �궗�슜�릺�뒗 �궗�슜�옄 �젙�쓽 �븘�뱶
+ var issueCustomFields = [];
+
+ angular.forEach($scope.vm.form.issueCustomFields, function (issueCustomField) {
+ var useValues = [];
+
+ if (angular.isArray(issueCustomField.useValues)) {
+ angular.forEach(issueCustomField.useValues, function (useValue) {
+ useValues.push(useValue.value);
+ });
+ }
+ else {
+ useValues.push(issueCustomField.useValues);
+ }
+
+ // useValues 瑜� 諛곗뿴濡� 蹂��솚�븳�떎.
+ var temp = angular.copy(issueCustomField);
+ temp.useValues = useValues;
+ issueCustomFields.push(temp);
});
+
+ return issueCustomFields;
+ })()
+ };
+
+ if ($scope.vm.inheritPartners && $scope.vm.downTotalCount > 0) {
+ SweetAlert.swal({
+ title : $filter("translate")("issue.modifyDownIssue"), // �븯�쐞 �씠�뒋 蹂�寃�
+ text : $filter("translate")("issue.wantToInheritPartnersOfParentIssue"), // �긽�쐞�씠�뒋�쓽 �뙆�듃�꼫 �젙蹂�(�뾽泥�/ISP/�샇�뒪�똿)瑜� �쟻�슜�떆�궎寃좎뒿�땲源�?
+ type : "warning",
+ showCancelButton : true,
+ confirmButtonColor : "#DD6B55",
+ confirmButtonText : $filter("translate")("common.ok"), // �꽕
+ cancelButtonText : $filter("translate")("common.no"), // �븘�땲�삤
+ closeOnConfirm : false,
+ closeOnCancel : false
+ },
+ function (isConfirm) {
+ if (isConfirm) {
+ inheritYn = true;
+ }
+
+ Issue.modify({
+ method : "POST",
+ file : (function () {
+ var files = [];
+
+ angular.forEach($scope.vm.form.files, function (file) {
+ if (angular.isUndefined(file.id)) {
+ files.push(file);
+ }
+ });
+
+ return files;
+ })(),
+ // data �냽�꽦�쑝濡� 蹂꾨룄�쓽 �뜲�씠�꽣 �쟾�넚
+ fields : {
+ content : content
+ },
+ fileFormDataName : "file"
+ }).then(function (result) {
+
+ if (result.data.message.status === "success") {
+ $scope.fn.cancel();
+
+ // �씠�뒋 �긽�꽭 �솕硫� �슂泥�
+ $rootScope.$broadcast("getIssueDetail", {
+ id : parameter.id
+ });
+
+ $rootScope.$broadcast("getIssueList");
+ }
+ else {
+ SweetAlert.error($filter("translate")("issue.failedIssueModify"), result.data.message.message); // �씠�뒋 �닔�젙 �떎�뙣
+ }
+
+ $rootScope.spinner = false;
+ });
+ });
+ } else {
+ Issue.modify({
+ method : "POST",
+ file : (function () {
+ var files = [];
+
+ angular.forEach($scope.vm.form.files, function (file) {
+ if (angular.isUndefined(file.id)) {
+ files.push(file);
+ }
+ });
+
+ return files;
+ })(),
+ // data �냽�꽦�쑝濡� 蹂꾨룄�쓽 �뜲�씠�꽣 �쟾�넚
+ fields : {
+ content : content
+ },
+ fileFormDataName : "file"
+ }).then(function (result) {
+
+ if (result.data.message.status === "success") {
+ $scope.fn.cancel();
+
+ // �씠�뒋 �긽�꽭 �솕硫� �슂泥�
+ $rootScope.$broadcast("getIssueDetail", {
+ id : parameter.id
+ });
+
+ $rootScope.$broadcast("getIssueList");
+ }
+ else {
+ SweetAlert.error($filter("translate")("issue.failedIssueModify"), result.data.message.message); // �씠�뒋 �닔�젙 �떎�뙣
+ }
+
+ $rootScope.spinner = false;
+ });
}
}
--
Gitblit v1.8.0