Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

이민희

2021-12-21 13df3419f367b1448a844120840459a17df02f3a

 src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js

@@ -153,9 +153,9 @@
                                            makeTag += "<ul class='ul-not-comma'>";

                                            if(scope.data.departmentVos != null && scope.data.departmentVos.length == 0){ //속해있는 부서가 없을 경우
                                                makeTag += "<div style='cursor: pointer; color: #0066ff'' ng-click='event.modifyUserDepartments(data.id, data.userId)'>부서를 선택해 주세요.</div>";
                                                makeTag += "<div style='cursor: pointer; color: #0066ff' ng-click='event.modifyUserDepartments(data.id, data.userId)'>부서를 선택해 주세요.</div>";
                                            }else{
                                                makeTag += "<div style='cursor: pointer; color: #0066ff'' ng-click='event.modifyUserDepartments(data.id, data.userId)'>";
                                                makeTag += "<div style='cursor: pointer; color: #0066ff' ng-click='event.modifyUserDepartments(data.id, data.userId)'>";
                                                angular.forEach(scope.data.departmentVos, function (departments) {
                                                    makeTag += "<li>" + departments.departmentName + "</li>";
                                                });
@@ -195,7 +195,7 @@

                                        //  하위이슈 카운트
                                        case "DOWN_ISSUE_COUNT" :
                                            makeTag += '<span>'  + scope.data.downIssueCount + ' / ' + scope.data.downIssueAllCount + '</span>';
                                            makeTag += '<span ng-click="event.changeDetailView(data.id)"  class="ul-not-comma cursor">'  + scope.data.downIssueCount + ' / ' + scope.data.downIssueAllCount + '</span>';
                                            break;

                                        //  프로젝트 기간 표시
@@ -417,7 +417,7 @@
                                            }

                                            break;
                                        // 이슈 제목scope.data.isApi
                                        // 이슈 제목
                                        case "ISSUE_TITLE" :
                                            makeTag += '<div class="tags text-left">';
                                            makeTag += '<i class="fa fa-star move-star" ng-show="$root.currentDetailIssueId == data.id">&nbsp;</i>';
@@ -452,6 +452,11 @@
                                            makeTag += "<span ng-click=\"event.changeDetailView(data.id)\" class='badge cursor' ng-style='{ \"background-color\" : \"" + scope.data.severityColor + "\"," + "\"border-color\"" + " : \"" + scope.data.severityColor + "\", \"color\": \"#FFFFFF\" }' translate='" + scope.data.severityName + "'></span>";
                                            break;

                                        // 이슈 유형
                                        case "COMMON_ISSUE_TYPE" :
                                            makeTag += "<span ng-click=\"event.changeDetailView(data.id)\" class='cursor' translate='" + scope.data.issueTypeName + "'></span>";
                                            break;

                                        // 담당 부서
                                        case "ISSUE_DEPARTMENT" :
                                            makeTag += "<ul ng-click=\"event.changeDetailView(data.id)\"  class='ul-not-comma cursor'>";
@@ -469,9 +474,21 @@
                                            break;

                                        // 등록자
                                        case "REGISTER" :
                                      /*  case "REGISTER" :
                                            scope.data.registerVos = [scope.data.registerVo];
                                            makeTag += '<div ng-click=\"event.changeDetailView(data.id)\" owl-profile-over class="cursor" table-user-image="data" target="registerVos"></div>';
                                            break;*/

                                        case "REGISTER" :
                                            scope.data.registerVos = [scope.data.registerVo];
                                            makeTag += "<ul ng-click=\"event.changeDetailView(data.id)\"  class='ul-not-comma cursor'>";
                                            makeTag += "<div style='color: #000000'>";
                                            angular.forEach(scope.data.registerVos, function (registers) {
                                                makeTag += "<li class='titlenameRegister cursor'>" + registers.name + "</li>";
                                                makeTag += "<li class='titlenameAccount cursor'>" + registers.account + "</li>";
                                            });
                                            makeTag += "</div>";
                                            makeTag += "</ul>";
                                            break;

                                        case "WORKFLOW_NAME":
@@ -646,7 +663,7 @@
                                            for (var count in scope.data.issueCustomFieldValueVos) {
                                                var issueCustomFieldValueVo = scope.data.issueCustomFieldValueVos[count];
                                                //  테이블 설정에서 dName 부분에 사용자 정의 필드 id 를 넣고 해당 값을 추출한다.
                                                if (tableConfig.columnHint.id == issueCustomFieldValueVo.customFieldVo.id) {
                                                if (tableConfig.columnHint.id === issueCustomFieldValueVo.customFieldVo.id) {
                                                    values.push(issueCustomFieldValueVo.useValue);
                                                }
                                            }