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

이민희

2022-03-14 12e19e0b8bc5e728169dad54c132e7ccd41973a4

 src/main/webapp/views/issue/issueDetail.html

@@ -107,7 +107,7 @@
                <i class="os-icon os-icon-airplay mr-20" ng-click="fn.versionView(vm.viewer.id)" data-toggle="tooltip" data-placement="right" title="이슈 변경 이력 상세 보기"></i>
<!--                <i class="os-icon os-icon-calendar-time mr-20" ng-if="vm.viewer.modifyPermissionCheck"-->
<!--                   ng-click="fn.reservation(vm.viewer.id)" data-toggle="tooltip" data-placement="right" title="이슈 발생 예약 하기"></i>-->
                <i class="os-icon os-icon-edit-1 mr-20" ng-click="fn.modify(vm.viewer.id)"
                <i class="os-icon os-icon-edit-1 mr-20" ng-click="fn.modify(vm.viewer.id, vm.viewer.downTotalCount)"
                   ng-if="vm.viewer.modifyPermissionCheck" data-toggle="tooltip" data-placement="left" title="이슈 수정 하기"></i>
                <!-- 상위 이슈가 있을때 뒤로가기 버튼 생성 -->
                <span ng-if="vm.issueIds[0] != vm.viewer.id && vm.issueIds.length != 0 && vm.issueIds.length != 1" class="issue-close mr-10" ng-click="fn.issueBack()"><i class="os-icon os-icon-arrow-left7" data-toggle="tooltip" data-placement="left" title="이슈 뒤로 이동"></i></span>
@@ -345,6 +345,17 @@
                    <div class="col-sm-2">
                        <div class="form-group">
                            <div class="">
                                <span translate="companyField.ipRange">IP 대역대</span>:
                                <span ng-if="vm.viewer.issueCompanyVos[0].ipStart != null && vm.viewer.issueCompanyVos[0].ipStart != ''">
                                    {{vm.viewer.issueCompanyVos[0].ipStart}} ~ {{vm.viewer.issueCompanyVos[0].ipEnd}}
                                </span>
                            </div>
                        </div>
                    </div>

                    <div class="col-sm-2">
                        <div class="form-group">
                            <div class="">
                                <span translate="companyField.memo">비고</span>:
                                <span>{{vm.viewer.issueCompanyVos[0].memo}}</span>
                            </div>
@@ -557,7 +568,7 @@
                </div>
            </div>

                <div class="row mt-30">
                <div class="row mt-30 align-items-end" style="justify-content: space-between;">
                    <div class="col-md-10">
                        <span class="info_detail_font h3" translate="issue.relationIssue">연관 이슈</span>
                    </div>
@@ -580,17 +591,19 @@
                            </label>
                        </div>
                    </div>
                    <div class="btn-group" style="left: 975px; padding: 5px">
                        <button aria-expanded="false" aria-haspopup="true"
                                tabindex="-1"
                                class="btn btn-secondary dropdown-toggle"
                                data-toggle="dropdown" type="button"><span translate="common.addFunction">추가기능</span>
                        </button>
                        <div aria-labelledby="dropdownMenuButton2" class="dropdown-menu left-menu"
                             x-placement="bottom-start" >
                            <!--<a class="dropdown-item cursor" form-submit="issueListForm" make-search-conditions="fn.makeSearchConditions()"> <span translate="common.allDownloadExcel">엑셀 다운로드</span></a>-->
                            <a class="dropdown-item cursor" ng-click="fn.addRelationIssueTableConfig()"> <span translate="issue.settingTableDisplay">테이블 표시 설정</span></a>
                            <a class="dropdown-item cursor" ng-click="fn.removeRelationIssue()"> <span translate="common.selectDelete">삭제</span></a>
                    <div class="col-5" style="display: flex; justify-content: flex-end; align-items: center">
                        <div class="btn-group" style="padding: 5px">
                            <button aria-expanded="false" aria-haspopup="true"
                                    tabindex="-1"
                                    class="btn btn-secondary dropdown-toggle"
                                    data-toggle="dropdown" type="button"><span translate="common.addFunction">추가기능</span>
                            </button>
                            <div aria-labelledby="dropdownMenuButton2" class="dropdown-menu left-menu"
                                 x-placement="bottom-start" >
                                <!--<a class="dropdown-item cursor" form-submit="issueListForm" make-search-conditions="fn.makeSearchConditions()"> <span translate="common.allDownloadExcel">엑셀 다운로드</span></a>-->
                                <a class="dropdown-item cursor" ng-click="fn.addRelationIssueTableConfig()"> <span translate="issue.settingTableDisplay">테이블 표시 설정</span></a>
                                <a class="dropdown-item cursor" ng-click="fn.removeRelationIssue()"> <span translate="common.selectDelete">삭제</span></a>
                            </div>
                        </div>
                    </div>
                </div>
@@ -629,7 +642,7 @@
                                    ng-click="fn.addRelationIssue()"
                                    translate="issue.addRelationIssue">연관 이슈 추가</button>
                            <button type="button" class="btn btn-sm btn-primary btn-roundRel  offset-1"
                                    ng-click="fn.addRelationIssueForm(vm.viewer.id, vm.viewer.issueTypeVo.id)">
                                    ng-click="fn.addRelationIssueForm(vm.viewer.id, vm.viewer.projectVo, vm.viewer.issueTypeVo.id)">
                                <i class="os-icon os-icon-plus"><span></span></i>
                            </button>
                        </div>
@@ -651,7 +664,7 @@
                    </div>
                </div>

                <div class="row mt-30">
                <div class="row mt-30 align-items-end" style="justify-content: space-between;">
                    <div class="col-md-8">
                        <span class="info_detail_font h3" translate="issue.downIssue">하위 이슈</span>
                    </div>
@@ -680,18 +693,26 @@
                            </label>
                        </div>
                    </div>
                    <div class="btn-group" style="left: 730px; padding: 5px">
                        <button aria-expanded="false" aria-haspopup="true"
                                tabindex="-1"
                                class="btn btn-secondary dropdown-toggle"
                                data-toggle="dropdown" type="button"><span translate="common.addFunction">추가기능</span>
                        </button>
                        <div aria-labelledby="dropdownMenuButton2" class="dropdown-menu left-menu"
                             x-placement="bottom-start" >
                            <!--<a class="dropdown-item cursor" form-submit="issueListForm" make-search-conditions="fn.makeSearchConditions()"> <span translate="common.allDownloadExcel">엑셀 다운로드</span></a>-->
                            <a class="dropdown-item cursor" ng-if="vm.viewer.modifyPermissionCheck" ng-click="fn.modifyDownIssueStatus()"> <span translate="common.updateDownIssueStatus">하위이슈 상태 변경</span></a>
                            <a class="dropdown-item cursor" ng-click="fn.addDownIssueTableConfig()"> <span translate="issue.settingTableDisplay">테이블 표시 설정</span></a>
                            <a class="dropdown-item cursor" ng-click="fn.removeDownIssue()"> <span translate="common.selectDelete">삭제</span></a>
                    <div class="col-5" style="display: flex; justify-content: flex-end; align-items: center">
                        <div style="display: flex; align-items: center; margin-right: 10px;">
                            <span class="issue-detail-label" style="margin-right: 4px;padding-top: 6px;"><span style="color: #0a7cf8">◆</span> 완료 이슈 숨기기</span>
                            <label class='switch'><input type='checkbox' ng-model='vm.hideCompleteIssue' ng-click="fn.getIssueDetail(0,0)">
                                <span class='slider round'></span>
                            </label>
                        </div>
                        <div class="btn-group" style="padding: 5px">
                            <button aria-expanded="false" aria-haspopup="true"
                                    tabindex="-1"
                                    class="btn btn-secondary dropdown-toggle"
                                    data-toggle="dropdown" type="button"><span translate="common.addFunction">추가기능</span>
                            </button>
                            <div aria-labelledby="dropdownMenuButton2" class="dropdown-menu left-menu"
                                 x-placement="bottom-start" >
                                <!--<a class="dropdown-item cursor" form-submit="issueListForm" make-search-conditions="fn.makeSearchConditions()"> <span translate="common.allDownloadExcel">엑셀 다운로드</span></a>-->
                                <a class="dropdown-item cursor" ng-if="vm.viewer.modifyPermissionCheck" ng-click="fn.modifyDownIssueStatus()"> <span translate="common.updateDownIssueStatus">하위이슈 상태 변경</span></a>
                                <a class="dropdown-item cursor" ng-click="fn.addDownIssueTableConfig()"> <span translate="issue.settingTableDisplay">테이블 표시 설정</span></a>
                                <a class="dropdown-item cursor" ng-click="fn.removeDownIssue()"> <span translate="common.selectDelete">삭제</span></a>
                            </div>
                        </div>
                    </div>
                </div>
@@ -719,7 +740,7 @@
                                    ng-click="fn.addDownIssue()"
                                    translate="issue.addDownIssue">추가</button>
                            <button type="button" class="btn btn-sm btn-primary btn-roundRel  offset-1"
                                    ng-click="fn.addDownIssueForm(vm.viewer.id, vm.viewer.issueTypeVo.id)">
                                    ng-click="fn.addDownIssueForm(vm.viewer.id, vm.viewer.projectVo, vm.viewer.issueTypeVo.id)">
                                <i class="os-icon os-icon-plus"><span></span></i>
                            </button>
                        </div>