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

wyu

2022-01-06 0dca48e62f053d2fa725649ee2842412a9b4f476

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

@@ -101,14 +101,17 @@
                    </span>
                </div>
            </span>

            <a class="show-ticket-info cursor">
                <i class="os-icon os-icon-email-forward mr-20" ng-if="vm.viewer.modifyPermissionCheck" ng-click="fn.sendMailAll()" data-toggle="tooltip" data-placement="right" title="다른 사용자에게 이슈 보내기"></i>
                <i class="os-icon os-icon-email-2-at2 mr-20" ng-if="vm.viewer.modifyPermissionCheck" ng-click="fn.sendCommonMail()" data-toggle="tooltip" data-placement="right" title="직접 작성한 메일 보내기"></i>
                <i class="os-icon os-icon-email-forward mr-20" ng-if="vm.viewer.modifyPermissionCheck" ng-click="fn.sendMailAll()" data-toggle="tooltip" data-placement="right" title="업체 메일 보내기"></i>
                <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-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)"
                   ng-if="vm.viewer.modifyPermissionCheck && vm.viewer.issueStatusVo.issueStatusType != 'CLOSE'" data-toggle="tooltip" data-placement="left" title="이슈 수정 하기"></i>
                <!-- 상위 이슈가 있을때 뒤로가기 버튼 생성 -->
                <span ng-if="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>
                <!-- 상위 이슈가 있을때 상세화면 닫기버튼 위치 조정 -->
                <span class="issue-close" ng-click="fn.listView()"><i class="os-icon os-icon-close" data-toggle="tooltip" data-placement="left" title="상세 화면 닫기"></i></span>
            </a>
        </div>
@@ -252,7 +255,7 @@
                            <!-- 멀티 셀렉트 -->
                            <div ng-switch-when="MULTI_SELECT">
                                <span class="issue-detail-word-break"
                                ng-repeat="useValue in issueCustomField.useValues">{{::useValue.value}}, </span>
                                ng-repeat="useValue in issueCustomField.useValues">{{::useValue.value}}</span>
                                <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>
                            </div>

@@ -486,17 +489,46 @@
                    <div class="col-md-10">
                        <span class="info_detail_font h3" translate="issue.relationIssue">연관 이슈</span>
                    </div>
                    <div class="col-md-1">
                    <!--<div class="col-md-1">
                        <button class="btn btn-darkgrey offset-10" ng-click="fn.addRelationIssueTableConfig()" type="button"><span translate="issue.settingTableDisplay">테이블 표시 설정</span></button>
                    </div>-->
                    <div class="col-md-3 mt-2">
                        <div class="dataTables_length">
                            <label>
                                <select name="relPageRow"
                                        tabindex="-1"
                                        class="form-control form-control-sm"
                                        ng-change="fn.changeDetailPageRowCount()"
                                        ng-model="vm.page.selectedRelPageRowCount">
                                    <option value="10">10</option>
                                    <option value="50">50</option>
                                    <option value="100">100</option>
                                </select> {{vm.page.selectedRelPage}}-{{vm.responseData.relPage.totalPage}} /
                                {{vm.responseData.relPage.totalCount | number}}<span translate="common.few">건</span>
                            </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>
                    </div>
                </div>

                <!--  연관 이슈 테이블 -->
                <div class="mt-10 issue-detail-word-break width-100">
                    <js-table data="vm.viewer.issueRelationVos" table-configs="vm.relTableConfigs"
                              event="relTableEvent" detail-view="true" hide-header="false" use-sort="true"></js-table>
                    <js-rel data="vm.viewer.issueRelationVos" table-configs="vm.relTableConfigs"
                              event="relTableEvent" detail-view="true" hide-header="false" use-sort="true"></js-rel>

                    <div class="row">
                    <div class="row" ng-if="vm.viewer.modifyPermissionCheck">
                        <div class="col-sm-4">
                            <select id="relationIssueType"
                                    name="relationIssueType"
@@ -522,16 +554,28 @@
                        </div>
                        <div class="col-auto vertical-middle" style="display: flex">
                            <button type="button" class="btn btn-primary"
                                    ng-if="vm.viewer.modifyPermissionCheck"
                                    ng-click="fn.addRelationIssue()"
                                    translate="issue.addRelationIssue">연관 이슈 추가</button>
                            <button type="button" class="btn btn-sm btn-primary btn-roundRel  offset-1"
                                    ng-if="vm.viewer.modifyPermissionCheck"
                                    ng-click="fn.addRelationIssueForm(vm.viewer.id)">
                                <i class="os-icon os-icon-plus"><span></span></i>
                            </button>
                        </div>

                    </div>
                    <div class="controls-below-table text-center">
                        <ul uib-pagination
                            boundary-links-numbes="true"
                            items-per-page="vm.page.selectedRelPageRowCount"
                            total-items="vm.responseData.relPage.totalCount"
                            ng-model="vm.page.selectedRelPage"
                            max-size="10"
                            ng-click="fn.getIssueDetail(vm.page.selectedRelPage - 1, vm.page.selectedDownPage - 1)"
                            class="pagination pagination-sm"
                            previous-text="&lt;"
                            next-text="&gt;"
                            first-text=""
                            last-text="">
                        </ul>
                    </div>
                </div>

@@ -539,7 +583,7 @@
                    <div class="col-md-8">
                        <span class="info_detail_font h3" translate="issue.downIssue">하위 이슈</span>
                    </div>
                    <div class="col-sm-2">
                    <!--<div class="col-sm-2">
                        <a><button type="button" class="btn btn-darkgrey offset-7" ng-if="vm.viewer.modifyPermissionCheck"
                                ng-click="fn.modifyDownIssueStatus()">
                                <span ng-if="vm.viewer.modifyPermissionCheck" translate="common.updateDownIssueAllStatus">하위이슈 상태 전체 변경</span>
@@ -547,16 +591,45 @@
                    </div>
                    <div class="col-sm-1">
                        <button class="btn btn-darkgrey offset-10"  ng-click="fn.addDownIssueTableConfig()" type="button"><span translate="issue.settingTableDisplay">테이블 표시 설정</span></button>
                    </div>-->
                    <div class="col-md-5 mt-2">
                        <div class="dataTables_length">
                            <label>
                                <select name="downPageRow"
                                        tabindex="-1"
                                        class="form-control form-control-sm"
                                        ng-change="fn.changeDetailPageRowCount()"
                                        ng-model="vm.page.selectedDownPageRowCount">
                                    <option value="10">10</option>
                                    <option value="50">50</option>
                                    <option value="100">100</option>
                                </select> {{vm.page.selectedDownPage}}-{{vm.responseData.downPage.totalPage}} /
                                {{vm.responseData.downPage.totalCount | number}}<span translate="common.few">건</span>
                            </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>
                    </div>
                </div>

                <!-- 하위 이슈 테이블 -->
                <div class="mt-10 issue-detail-word-break width-100">
                    <js-table data="vm.viewer.issueDownVos" table-configs="vm.downTableConfigs"
                              event="downTableEvent" detail-view="true" hide-header="false" use-sort="true"></js-table>
                    <js-down data="vm.viewer.issueDownVos" table-configs="vm.downTableConfigs"
                              event="downTableEvent" detail-view="true" hide-header="false" use-sort="true"></js-down>

                    <div class="row">

                    <div class="row" ng-if="vm.viewer.modifyPermissionCheck">
                        <div class="col-sm-6">
                            <js-autocomplete-single data-input-name="issue"
                                                    selected-model="vm.form.issuesDown"
@@ -571,16 +644,28 @@
                        </div>
                        <div class="col-auto vertical-middle" style="display: flex">
                            <button type="button" class="btn btn-primary"
                                    ng-if="vm.viewer.modifyPermissionCheck"
                                    ng-click="fn.addDownIssue()"
                                    translate="issue.addDownIssue">추가</button>
                            <button type="button" class="btn btn-sm btn-primary btn-roundRel  offset-1"
                                    ng-if="vm.viewer.modifyPermissionCheck"
                                    ng-click="fn.addDownIssueForm(vm.viewer.id)">
                                <i class="os-icon os-icon-plus"><span></span></i>
                            </button>
                        </div>

                    </div>
                    <div class="controls-below-table text-center">
                        <ul uib-pagination
                            boundary-links-numbes="true"
                            items-per-page="vm.page.selectedDownPageRowCount"
                            total-items="vm.responseData.downPage.totalCount"
                            ng-model="vm.page.selectedDownPage"
                            max-size="10"
                            ng-click="fn.getIssueDetail(vm.page.selectedRelPage - 1, vm.page.selectedDownPage - 1)"
                            class="pagination pagination-sm"
                            previous-text="&lt;"
                            next-text="&gt;"
                            first-text=""
                            last-text="">
                        </ul>
                    </div>
                </div>

@@ -692,6 +777,9 @@
                            <div class="tab-content">
                                <!--    전체 기록 보기    -->
                                <div ng-if="vm.activeTab == 'ALL'">
                                    <div class="no-cont2" ng-if="vm.viewer.activeHistory.length < 1" translate="common.noRecord">
                                        기록이 없습니다.
                                    </div>
                                    <div class="ae-item row" ng-repeat="activeHistory in vm.viewer.activeHistory">
                                        <!--    기록인 경우   -->
                                        <div class="aei-content"
@@ -825,7 +913,7 @@
                                </div>
                                <!--    하위이슈 기록 보기    -->
                                <div ng-if="vm.activeTab == 'RECODE_DOWN'">
                                    <div class="no-cont2" ng-if="vm.viewer.activeDownAllHistory.length < 1" translate="common.noRecord">
                                    <div class="no-cont2" ng-if="!$root.isDefined(vm.viewer.activeDownAllHistory) || vm.viewer.activeDownAllHistory.length < 1" translate="common.noRecord">
                                        기록이 없습니다.
                                    </div>
                                    <div class="ae-item row" ng-repeat="issueDownHistory in vm.viewer.activeDownAllHistory">