From 6ae9f3ab6d498f7a4d72c3fbbe8b90e6358f389b Mon Sep 17 00:00:00 2001 From: wyu <kknd09321@nate.com> Date: 화, 21 12월 2021 13:31:54 +0900 Subject: [PATCH] 사용자 정의필드 시간형태 등호 변경 --- src/main/webapp/scripts/app/issueType/issueTypeModify.controller.js | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 51 insertions(+), 1 deletions(-) diff --git a/src/main/webapp/scripts/app/issueType/issueTypeModify.controller.js b/src/main/webapp/scripts/app/issueType/issueTypeModify.controller.js index 24284c5..8818a3e 100644 --- a/src/main/webapp/scripts/app/issueType/issueTypeModify.controller.js +++ b/src/main/webapp/scripts/app/issueType/issueTypeModify.controller.js @@ -13,9 +13,11 @@ $scope.fn = { getWorkflowListCallBack : getWorkflowListCallBack, // �썙�겕�뵆濡쒖슦 auto complete callback function + getProjectListCallBack : getProjectListCallBack, // �봽濡쒖젥�듃 auto complete callback function cancel : cancel, // �뙘�뾽 李� �떕湲� formSubmit : formSubmit, // �뤌 �쟾�넚 formCheck : formCheck, // �뤌 泥댄겕 + removeUsePartner : removeUsePartner, // �뾽泥�/isp/�샇�뒪�똿 �궘�젣 detail : detail // �긽�꽭 �젙蹂� }; @@ -28,12 +30,20 @@ id : parameter.id, name : "", workflows : [], // �썙�겕�뵆濡쒖슦 + projects : [], // �봽濡쒖젥�듃 description : "", // �꽕紐� - color : "" // �깋�긽 + color : "", // �깋�긽 + companies : [] // �뾽泥�/isp/�샇�뒪�똿 �꽑�깮 諛곗뿴 }, + companyName : "", workflowName : "", + projectName : "", autoCompletePage : { workflow : { + page : 0, + totalPage : 0 + }, + project : { page : 0, totalPage : 0 } @@ -91,12 +101,17 @@ angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector})); + function formCheck(formInvalid) { if (formInvalid) { return true; } if ($scope.vm.form.workflows.length < 1) { + return true; + } + + if ($scope.vm.form.projects.length < 1) { return true; } @@ -117,6 +132,24 @@ return workflowId; })(), + projectId : (function () { + var projectId = ""; + + if ($scope.vm.form.projects.length > 0) { + projectId = $scope.vm.form.projects[0].id; + } + + return projectId; + })(), + companyIds : (function () { + var companyIds = []; + + $scope.vm.form.companies.forEach(function (company) { + companyIds.push(company.id); + }); + + return companyIds; + })(), name : $rootScope.preventXss($scope.vm.form.name), description : $rootScope.preventXss($scope.vm.form.description), color : $scope.vm.form.color @@ -128,6 +161,7 @@ if (result.data.message.status === "success") { $scope.fn.cancel(); + $rootScope.$broadcast("modifyIssueType", {}); // 紐⑸줉 �솕硫� 媛깆떊 $rootScope.$broadcast("getIssueTypeList", {}); } @@ -144,11 +178,21 @@ $scope.vm.autoCompletePage.workflow.totalPage = result.data.page.totalPage; } + function getProjectListCallBack(result) { + $scope.vm.autoCompletePage.project.totalPage = result.data.page.totalPage; + } + function cancel() { $rootScope.$broadcast("closeLayer"); // �뙘�뾽�씠 �뿴由ш퀬 �굹�꽌 js-multi, js-single �벑�뿉�꽌 body �씠踰ㅽ듃媛� �궇�븘媛��뒗 �쁽�긽 �닔�젙 $uibModalInstance.dismiss('cancel'); $(document).unbind("keydown"); // �떒異뺥궎 �씠踰ㅽ듃 �젣嫄� } + + // �뾽泥�/ISP/�샇�뒪�똿 �궘�젣 + function removeUsePartner(index) { + $scope.vm.form.companies.splice(index, 1); + } + function detail() { $scope.vm.form.workflows = []; @@ -163,6 +207,12 @@ $scope.vm.form.description = result.data.data.description; $scope.vm.form.workflows.push(result.data.data.workflowVo); $scope.vm.workflowName = result.data.data.workflowVo.name; + if (result.data.data.projectVo != null) { + $scope.vm.form.projects.push(result.data.data.projectVo); + $scope.vm.projectName = result.data.data.projectVo.name; + } + $scope.vm.form.companies = result.data.data.usePartnerVos; + $scope.vm.form.color = result.data.data.color; } } -- Gitblit v1.8.0