From 916a3cbabe4e50062fce61ff6f2f5d46c05dfbd1 Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 목, 17 3월 2022 17:47:45 +0900 Subject: [PATCH] - api로 이슈 추가 시 url/ip로 업체 찾는 코드 수정 --- src/main/webapp/custom_components/js-workflow/js-workflow.directive.js | 57 +++++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 41 insertions(+), 16 deletions(-) diff --git a/src/main/webapp/custom_components/js-workflow/js-workflow.directive.js b/src/main/webapp/custom_components/js-workflow/js-workflow.directive.js index a227475..7a36c78 100644 --- a/src/main/webapp/custom_components/js-workflow/js-workflow.directive.js +++ b/src/main/webapp/custom_components/js-workflow/js-workflow.directive.js @@ -176,6 +176,17 @@ angular.forEach($scope.vm.issueStatusVos, function (startStatus) { if ($scope.vm.targetStatusId != startStatus.id) { + switch (startStatus.issueStatusType) { + case 'READY' : + startStatus.issueStatusTypeKr = '��湲�' + break; + case 'OPEN' : + startStatus.issueStatusTypeKr = '吏꾪뻾' + break; + case 'CLOSE' : + startStatus.issueStatusTypeKr = '醫낅즺' + break; + } availableStatus.push(startStatus); } }); @@ -583,6 +594,17 @@ } if (!exist) { + switch (issueStatus.issueStatusType) { + case 'READY' : + issueStatus.issueStatusTypeKr = '��湲�' + break; + case 'OPEN' : + issueStatus.issueStatusTypeKr = '吏꾪뻾' + break; + case 'CLOSE' : + issueStatus.issueStatusTypeKr = '醫낅즺' + break; + } $scope.vm.issueStatuses.push(issueStatus); } }); @@ -669,24 +691,27 @@ if ($scope.vm.activeTarget != null) { var targetIssueStatus = $scope.vm.activeTarget.issueStatus; - var myIssueStatus = null; - angular.forEach($scope.vm.issueStatusVos, function (issueStatusVo) { - if (issueStatusVo.id === targetIssueStatus.id) { - myIssueStatus = issueStatusVo; - } - }); + // null 泥댄겕 + if (targetIssueStatus != null) { + var myIssueStatus = null; + angular.forEach($scope.vm.issueStatusVos, function (issueStatusVo) { + if (issueStatusVo.id === targetIssueStatus.id) { + myIssueStatus = issueStatusVo; + } + }); - if (myIssueStatus != null) { - if ($scope.vm.departments != null) { - var workflowDepartments = []; + if (myIssueStatus != null) { + if ($scope.vm.departments != null) { + var workflowDepartments = []; - angular.forEach($scope.vm.departments, function (department) { - var workflowDepartment = { - departmentVo : department - } - workflowDepartments.push(workflowDepartment); - }); - myIssueStatus.workflowDepartmentVos = workflowDepartments; + angular.forEach($scope.vm.departments, function (department) { + var workflowDepartment = { + departmentVo : department + } + workflowDepartments.push(workflowDepartment); + }); + myIssueStatus.workflowDepartmentVos = workflowDepartments; + } } } } -- Gitblit v1.8.0