From 1dad4d94cc415d2f8092aff0368744289337f504 Mon Sep 17 00:00:00 2001
From: 박지현 <jhpark@maprex.co.kr>
Date: 화, 22 2월 2022 14:29:43 +0900
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/webapp/scripts/app/issue/issueModify.controller.js | 143 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 111 insertions(+), 32 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueModify.controller.js b/src/main/webapp/scripts/app/issue/issueModify.controller.js
index 6d89d2b..39d20af 100644
--- a/src/main/webapp/scripts/app/issue/issueModify.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueModify.controller.js
@@ -169,6 +169,9 @@
priorities : [], // �슦�꽑�닚�쐞 �젙蹂�
severities : [], // 以묒슂�룄 �젙蹂�
fileTableConfigs : [], // �뙆�씪 �뾽濡쒕뱶 �젙蹂� �뀒�씠釉�
+ inheritPartners : parameter.inheritPartners,
+ downTotalCount : parameter.downTotalCount,
+ usePartner : parameter.usePartner,
};
// �뿰愿� �씪媛� 愿��젴
@@ -404,7 +407,16 @@
}
// �뾽泥� 移댄뀒怨좊━ autocomplete page �뾽�뜲�씠�듃
- function getParentSectorListCallBack(result) {
+ function getParentSectorListCallBack(result, value) {
+ if (value === "") {
+ $scope.vm.form.parentSectorId = "";
+ if ($rootScope.isDefined($scope.vm.form.parentSectors) && $rootScope.isDefined($scope.vm.form.parentSectors[0])) {
+ $scope.vm.form.parentSectors[0].id = "";
+ }
+ $scope.vm.form.childSectorId = "";
+ $scope.vm.form.childSector = "";
+ $scope.vm.form.childSectors = [];
+ }
$scope.vm.autoCompletePage.parentSector.totalPage = result.data.page.totalPage;
}
@@ -443,6 +455,11 @@
$scope.$on("parentSectorEvent", function (event, result) {
if ($rootScope.isDefined(result) && $rootScope.isDefined(result[0])) {
$scope.vm.form.parentSectorId = result[0].id;
+ } else {
+ $scope.vm.form.parentSectorId = "";
+ if ($rootScope.isDefined($scope.vm.form.parentSectors) && $rootScope.isDefined($scope.vm.form.parentSectors[0])) {
+ $scope.vm.form.parentSectors[0].id = "";
+ }
}
$scope.vm.form.childSectorId = "";
$scope.vm.form.childSector = "";
@@ -561,11 +578,13 @@
function formSubmit() {
$rootScope.spinner = true;
+ let inheritYn = false;
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,
@@ -734,7 +753,8 @@
parentSectorId : $scope.vm.form.parentSectorId,
childSectorId : $scope.vm.form.childSectorId,
regionId : $scope.vm.form.regionId,
- statusId : $scope.vm.form.statusId
+ statusId : $scope.vm.form.statusId,
+ statusName : $scope.vm.form.status
});
}
@@ -824,42 +844,101 @@
})()
};
- 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
+ if ($rootScope.isDefined($scope.vm.usePartner) && $scope.vm.usePartner.length > 0
+ && $rootScope.isDefined($scope.vm.inheritPartners) && $scope.vm.inheritPartners
+ && $rootScope.isDefined($scope.vm.downTotalCount) && $scope.vm.downTotalCount > 0) {
+ SweetAlert.swal({
+ title : $filter("translate")("issue.modifyIssues"), // �씠�뒋 蹂�寃�
+ text : $filter("translate")("issue.wantToInheritPartnersOfIssue"), // �쁽�옱 �씠�뒋�쓽 �뙆�듃�꼫 �젙蹂�(�뾽泥�/ISP/�샇�뒪�똿)瑜� 紐⑤뱺 �븯�쐞�씠�뒋�뿉 �씪愿� �쟻�슜�떆�궎寃좎뒿�땲源�?
+ type : "warning",
+ showCancelButton : true,
+ confirmButtonColor : "#DD6B55",
+ confirmButtonText : $filter("translate")("common.ok"), // �꽕
+ cancelButtonText : $filter("translate")("common.no"), // �븘�땲�삤
+ closeOnConfirm : false,
+ closeOnCancel : false
},
- fileFormDataName : "file"
- }).then(function (result) {
+ function (isConfirm) {
+ if (isConfirm) {
+ inheritYn = true;
+ content.inheritYn = true;
+ }
- if (result.data.message.status === "success") {
- $scope.fn.cancel();
+ Issue.modify({
+ method : "POST",
+ file : (function () {
+ var files = [];
- // �씠�뒋 �긽�꽭 �솕硫� �슂泥�
- $rootScope.$broadcast("getIssueDetail", {
- id : parameter.id
+ 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 = [];
- $rootScope.$broadcast("getIssueList");
- }
- else {
- SweetAlert.error($filter("translate")("issue.failedIssueModify"), result.data.message.message); // �씠�뒋 �닔�젙 �떎�뙣
- }
+ angular.forEach($scope.vm.form.files, function (file) {
+ if (angular.isUndefined(file.id)) {
+ files.push(file);
+ }
+ });
- $rootScope.spinner = false;
- });
+ 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;
+ });
+ }
}
function cancel() {
--
Gitblit v1.8.0