From 7ae30b7ac631cf506a22e9d4b60a3b0a07fa2d27 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 23 2월 2022 18:03:41 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.28:9001/r/owl-kisa
---
src/main/webapp/custom_components/js-workflow/js-workflow.directive.js | 46 ++++++++++++++++++++++++++++++----------------
1 files changed, 30 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..9b1096e 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
@@ -583,6 +583,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 +680,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