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

이민희

2021-12-07 4677f35851fd0daed02d12858e71c79056969d68

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

 src/main/webapp/custom_components/js-information/js-information.html

@@ -1,6 +1,6 @@
<div class="floated-chat-btn" ui-sref="support.support" ng-if="$root.showaskbtn()">
    <i class="os-icon os-icon-mail-07"></i><span translate="inquiry.toInquiry">문의하기</span>
</div>
<!--<div class="floated-chat-btn" ui-sref="support.support" ng-if="$root.showaskbtn()">-->
<!--    <i class="os-icon os-icon-mail-07"></i><span translate="inquiry.toInquiry">문의하기</span>-->
<!--</div>-->
<!--
<div class="floated-chat-w active" ng-show="$root.information">
    <div class="floated-chat-i">

 src/main/webapp/scripts/app/issue/issueAdd.controller.js

@@ -120,6 +120,18 @@
                    fileTableConfigs : [],   //  파일 업로드 정보 테이블
                };

                // 연관 일감 관련
                $scope.vm.relationIssueTypes =
                    [
                        { id: 0, name: $filter("translate")("issue.relationIssueType1") },
                        { id: 1, name: $filter("translate")("issue.relationIssueType2") },
                        { id: 2, name: $filter("translate")("issue.relationIssueType3") },
                        { id: 3, name: $filter("translate")("issue.relationIssueType4") },
                        { id: 4, name: $filter("translate")("issue.relationIssueType5") },
                        { id: 5, name: $filter("translate")("issue.relationIssueType6") }
                    ];
                $scope.vm.relationIssueType = $scope.vm.relationIssueTypes[0];

                angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector}));

                function getStartProjectListCallback(result){

 src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js

@@ -156,7 +156,7 @@

                //  사용자 정의 필드를 조회한 후 표시할 이슈 테이블 컬럼을 준비한다.
                $scope.fn.getCustomFields().then(function (result) {
                    var count = 7;
                    var count = 8;
                    angular.forEach(result, function (customField) {
                        $scope.vm.issueDownTableConfigs.push({
                            name : customField.name,

 src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js

@@ -152,7 +152,7 @@

                //  사용자 정의 필드를 조회한 후 표시할 이슈 테이블 컬럼을 준비한다.
                $scope.fn.getCustomFields().then(function (result) {
                    var count = 6;
                    var count = 7;
                    angular.forEach(result, function (customField) {
                        $scope.vm.issueRelTableConfigs.push({
                            name : customField.name,

 src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js

@@ -172,7 +172,7 @@

                //  사용자 정의 필드를 조회한 후 표시할 이슈 테이블 컬럼을 준비한다.
                $scope.fn.getCustomFields().then(function (result) {
                    var count = 8;
                    var count = 10;
                    angular.forEach(result, function (customField) {
                        $scope.vm.issueTableConfigs.push({
                            name : customField.name,

 src/main/webapp/scripts/app/issue/issueModify.controller.js

@@ -126,6 +126,18 @@
                    fileTableConfigs : [],   //  파일 업로드 정보 테이블
                };

                // 연관 일감 관련
                $scope.vm.relationIssueTypes =
                    [
                        { id: 0, name: $filter("translate")("issue.relationIssueType1") },
                        { id: 1, name: $filter("translate")("issue.relationIssueType2") },
                        { id: 2, name: $filter("translate")("issue.relationIssueType3") },
                        { id: 3, name: $filter("translate")("issue.relationIssueType4") },
                        { id: 4, name: $filter("translate")("issue.relationIssueType5") },
                        { id: 5, name: $filter("translate")("issue.relationIssueType6") }
                    ];
                $scope.vm.relationIssueType = $scope.vm.relationIssueTypes[0];

                angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector}));

                //  프로젝트가 변경되면 담당부서 초기화

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

@@ -211,6 +211,20 @@
                    </div>
                </div>
            </div>

            <div class="row">
                <div class="col-sm-4">
                    <label class="issue-label" translate="issue.relationIssueType">연관 이슈 구분</label>
                    <select id="relationIssueType"
                            name="relationIssueType"
                            class="form-control input-sm"
                            ng-options="option.name for option in vm.relationIssueTypes track by option.id"
                            ng-model="vm.relationIssueType"
                            required>
                    </select>
                </div>
            </div>

            <hr>
            <div class="row">
                <div class="col-lg-4 fontcolor_green">
@@ -229,7 +243,7 @@

                    <div class="col-md-4" ng-repeat="issueCustomField in vm.form.issueCustomFields">
                        <div class="form-group mgb5">
                            <label class="issue-label">{{issueCustomField.customFieldVo.name}}</label>
                            <label class="issue-label">{{issueCustomField.customFieldVo.name}}<code ng-if="" class="highlighter-rouge">&nbsp;*</code></label>

                            <div ng-switch on="issueCustomField.customFieldVo.customFieldType">
                                <!-- 기본 입력 -->

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

@@ -211,6 +211,19 @@
                    </div>
                </div>
            </div>

            <div class="row">
                <div class="col-sm-4">
                    <select id="relationIssueType"
                            name="relationIssueType"
                            class="form-control input-sm"
                            ng-options="option.name for option in vm.relationIssueTypes track by option.id"
                            ng-model="vm.relationIssueType"
                            required>
                    </select>
                </div>
            </div>

            <hr>
            <div class="row">
                <div class="col-lg-4 fontcolor_green">