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

이민희

2021-11-24 8e7861e68cfba8f27d413437654f435a22f05cac

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

@@ -86,23 +86,14 @@
<!--    상세 화면   -->
<div class="support-ticket-content-w" ng-controller="issueDetailController">
    <div class="support-ticket-content">
        <span class="badge" ng-style="{'background-color' : vm.viewer.severityVo.color, 'border-color' : vm.viewer.severityVo.color, 'color' : '#FFFFFF' }">
            <span ng-if="vm.viewer.parentIssueId != '' || vm.viewer.parentIssueId != 'null' ">상위 일감:{{vm.viewer.parentIssueID}}</span>
            <i class="os-icon-airplay">OWL Trial</i>
        <span ng-if="vm.viewer.parentIssueVo != null" class="badge" ng-style="{'background-color' : vm.viewer.issueStatusVo.color, 'border-color' : vm.viewer.issueStatusVo.color, 'color' : '#FFFFFF' }">
            <span>상위 이슈:{{vm.viewer.parentIssueVo.title}}</span>
        </span>
        <label class="issue-detail-label offset-1"><span translate="issue.issueType">이슈 유형</span> </label>
        <span class="status-pill smaller"
              ng-style="{'background-color': vm.viewer.issueTypeVo.color }"></span><span>{{vm.viewer.issueTypeVo.name}}</span>
        <span class="offset-1"> {{vm.viewer.registerDate}}</span>
        <label class="issue-detail-label offset-1"><span translate="common.register">등록자</span></label>
        <span class="select3-selection__choice">
                <span class="avatar-w"><img ng-src="{{vm.viewer.registerVo.profile}}"></span>
                <span>{{vm.viewer.registerVo.byName}}</span>
            </span>

        <div class="">
            <span class="h3-div">{{vm.viewer.title}}</span>
        </div>
        <div class="support-ticket-content-header issue-detail-word-break">
        <div class="support-ticket-content-header issue-detail-word-break" style="height: 5vh">
            <span class="ticket-header">
                <div class="tasks-header-w">
                    <span class="tags">
@@ -121,7 +112,15 @@
                <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>

        <label class="issue-detail-label"><span translate="issue.issueType">이슈 유형</span> </label>
        <span class="status-pill smaller"
              ng-style="{'background-color': vm.viewer.issueTypeVo.color }"></span><span>{{vm.viewer.issueTypeVo.name}}</span>
        <span class="offset-1"> {{vm.viewer.registerDate}}</span>
        <label class="issue-detail-label offset-1"><span translate="common.register">등록자</span></label>
        <span class="select3-selection__choice">
            <span class="avatar-w"><img ng-src="{{vm.viewer.registerVo.profile}}"></span>
            <span>{{vm.viewer.registerVo.byName}}</span>
        </span>
        <div class="ticket-thread">
            <div class="todo-content">
                <h6 class="todo-content-subheader" translate="issue.issueInfo">이슈 정보</h6>
@@ -185,6 +184,7 @@
                        </div>
                    </div>
                </div>
                <hr>
                <div class="row">
                    <div class="col-md-4">
                        <div class="form-group">
@@ -376,37 +376,45 @@
                    </div>
                </div>

                    <!-- 사용자 정의 필드 -->
<!--                <div class="row">-->
<!--                    <div class="col-md-4" ng-repeat="issueCustomField in vm.viewer.issueCustomFields">-->
<!--                        <label class="issue-detail-label">{{::issueCustomField.customFieldVo.name}}</label>-->

                <div class="row">
                    <div class="col-md-4" ng-repeat="issueCustomField in vm.viewer.issueCustomFields">
                        <label class="issue-detail-label">{{::issueCustomField.customFieldVo.name}}</label>
<!--                        <div ng-switch on="issueCustomField.customFieldVo.customFieldType">-->
<!--                            &lt;!&ndash; 기본 입력 &ndash;&gt;-->
<!--                            <div ng-switch-when="INPUT" class="form-group">-->
<!--                                &lt;!&ndash;    읽기 모드   &ndash;&gt;-->
<!--                                <span class="issue-detail-word-break">{{::issueCustomField.useValues}}</span>-->
<!--                                <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>-->
<!--                            </div>-->

                        <div ng-switch on="issueCustomField.customFieldVo.customFieldType">
                            <!-- 기본 입력 -->
                            <div ng-switch-when="INPUT" class="form-group">
                                <!--    읽기 모드   -->
                                <span class="issue-detail-word-break">{{::issueCustomField.useValues}}</span>
                                <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>
                            </div>
<!--                            &lt;!&ndash; 단일 셀렉트 &ndash;&gt;-->
<!--                            <div ng-switch-when="SINGLE_SELECT" class="form-group">-->
<!--                                <span class="issue-detail-word-break">{{::issueCustomField.useValues}}</span>-->
<!--                                <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>-->
<!--                            </div>-->

                            <!-- 단일 셀렉트 -->
                            <div ng-switch-when="SINGLE_SELECT" class="form-group">
                                <span class="issue-detail-word-break">{{::issueCustomField.useValues}}</span>
                                <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>
                            </div>
<!--                            &lt;!&ndash; 멀티 셀렉트 &ndash;&gt;-->
<!--                            <div ng-switch-when="MULTI_SELECT" class="form-group">-->
<!--                                <span class="issue-detail-word-break"-->
<!--                                      ng-repeat="useValue in issueCustomField.useValues">{{::useValue.value}}, </span>-->
<!--                                <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>-->
<!--                            </div>-->
<!--                        </div>-->
<!--                    </div>-->
<!--                </div>-->

                            <!-- 멀티 셀렉트 -->
                            <div ng-switch-when="MULTI_SELECT" class="form-group">
                                <span class="issue-detail-word-break"
                                      ng-repeat="useValue in issueCustomField.useValues">{{::useValue.value}}, </span>
                                <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>
                            </div>
                        </div>
                <div class="row mt-30">
                    <div class="col-md-10">
                        <span class="info_font h3" translate="issue.relationIssue">연관 이슈</span>
                    </div>
                    <div class="col-md-1">
                        <button class="btn btn-darkgrey offset-12" ng-click="fn.addRelationIssueTableConfig()" type="button"><span translate="issue.settingTableDisplay">테이블 표시 설정</span></button>
                    </div>
                </div>

                <h6 class="todo-content-subheader mt-20" translate="issue.relationIssue">연관 일감</h6>
                <!--    테이블 -->
                <!--  연관 이슈 테이블 -->
                <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="false"></js-table>
@@ -438,14 +446,22 @@
                        <div class="col-auto vertical-middle">
                            <button type="button" class="btn btn-primary form-control input-sm"
                                    ng-click="fn.addRelationIssue()"
                                    translate="issue.addRelationIssue">추가</button>
                                    translate="issue.addRelationIssue">연관 이슈 추가</button>
                        </div>

                    </div>
                </div>

                <h6 class="todo-content-subheader mt-20" translate="issue.downIssue">하위 일감</h6>
                <!--    테이블 -->
                <div class="row mt-30">
                    <div class="col-md-10">
                        <span class="info_font h3" translate="issue.downIssue">하위 이슈</span>
                    </div>
                    <div class="col-md-1">
                        <button class="btn btn-darkgrey offset-12"  ng-click="fn.addDownIssueTableConfig()" type="button"><span translate="issue.settingTableDisplay">테이블 표시 설정</span></button>
                    </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="false"></js-table>
@@ -472,7 +488,7 @@
                    </div>
                </div>

                <h6 class="todo-content-subheader mt-20" translate="common.content">내용</h6>
                <h6 class="todo-content-subheader mt-30" translate="common.content">내용</h6>
                <div class="box mt-10 issue-detail-word-break width-100" >
                    <div ng-bind-html="$root.$sce.trustAsHtml(vm.viewer.description)"></div>
                    <span class="fc-grey" ng-if="!$root.isDefined(vm.viewer.description)" translate="common.noContent">
@@ -664,6 +680,9 @@
                                         translate="common.noRecord">
                                        기록이 없습니다.
                                    </div>
                                    <div>
                                        {{vm.viewer.issueHistoryVos}}
                                    </div>

                                    <div class="activity-item"
                                         ng-repeat="issueHistory in vm.viewer.issueHistoryVos">