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

이민희

2021-12-09 e667982e30dbf36b093132c7293d63e12242fb51

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

 src/main/resources/migration/V1_12__Alter_Table.sql

@@ -1,17 +1 @@
-- 필수 데이터 여부
ALTER TABLE `custom_field` ADD COLUMN  `required_data` VARCHAR(1) NOT NULL DEFAULT 'N';

-- url 항목 추가
ALTER TABLE `company_field` ADD COLUMN  `url` VARCHAR(255) NULL;
ALTER TABLE `isp_field` ADD COLUMN  `url` VARCHAR(255) NULL;
ALTER TABLE `hosting_field` ADD COLUMN  `url` VARCHAR(255) NULL;

ALTER TABLE `issue_company` ADD COLUMN  `url` VARCHAR(255) NULL;
ALTER TABLE `issue_isp` ADD COLUMN  `url` VARCHAR(255) NULL;
ALTER TABLE `issue_hosting` ADD COLUMN  `url` VARCHAR(255) NULL;

-- 자동 완료 상태 추가
ALTER TABLE `issue_type` ADD COLUMN  `complete_issue_status_id` BIGINT(20) NULL;

-- 업체의 url 컬럼 INDEX 추가
ALTER TABLE `company_field` ADD INDEX `urlIndex`(`url`);
ALTER TABLE `user` ADD INDEX `levelIdIndex`(`level_id`);

 src/main/resources/migration/V1_13__Alter_Table.sql

New file
@@ -0,0 +1,17 @@
-- 필수 데이터 여부
ALTER TABLE `custom_field` ADD COLUMN  `required_data` VARCHAR(1) NOT NULL DEFAULT 'N';

-- url 항목 추가
ALTER TABLE `company_field` ADD COLUMN  `url` VARCHAR(255) NULL;
ALTER TABLE `isp_field` ADD COLUMN  `url` VARCHAR(255) NULL;
ALTER TABLE `hosting_field` ADD COLUMN  `url` VARCHAR(255) NULL;

ALTER TABLE `issue_company` ADD COLUMN  `url` VARCHAR(255) NULL;
ALTER TABLE `issue_isp` ADD COLUMN  `url` VARCHAR(255) NULL;
ALTER TABLE `issue_hosting` ADD COLUMN  `url` VARCHAR(255) NULL;

-- 자동 완료 상태 추가
ALTER TABLE `issue_type` ADD COLUMN  `complete_issue_status_id` BIGINT(20) NULL;

-- 업체의 url 컬럼 INDEX 추가
ALTER TABLE `company_field` ADD INDEX `urlIndex`(`url`);

 src/main/webapp/index.html

@@ -40,7 +40,7 @@
    <link type="text/css" rel="stylesheet" href="custom_components/js-autocomplete-single/js-autocomplete-single.css">
    <link type="text/css" rel="stylesheet" href="custom_components/js-autocomplete-multi/js-autocomplete-multi.css">
    <link type="text/css" rel="stylesheet" href="custom_components/js-html-diff/js-html-diff.css">
    <link type="text/css" rel="stylesheet" href="assets/styles/main.css?version=1.0.0">
    <link type="text/css" rel="stylesheet" href="assets/styles/main.css?version=0.9.0">
    <link type="text/css" rel="stylesheet" href="https://fonts.googleapis.com/css?family=Rubik:300,400,500">

    <!--    google font -->

 src/main/webapp/scripts/app/api/apiSetting.controller.js

@@ -140,7 +140,7 @@
                    });
                }

                $scope.$watch("vm.issueTypeId", function (newValue){
                $scope.$watch("vm.issueTypeId", function (newValue, oldValue){
                    if (newValue != null && newValue !== "") {
                        $scope.fn.loadPage();
                    }
@@ -189,7 +189,6 @@
                }

                function onChangeIssueTypeOverlap() {
                    $scope.fn.getIssueStatuses();
                    $scope.fn.getIssueTypeCustomFields();
                    $scope.fn.getOverlapList();
                }
@@ -237,8 +236,6 @@
                            if (result.data.message.status === "success") {
                                SweetAlert.swal($filter("translate")("api.successToApiAutoCompleteIssueStatus"), result.data.message.message, "success"); // "설정 성공"
                                $scope.fn.getIssueTypes();
                                $scope.fn.getIssueStatuses();
                                $scope.fn.getIssueTypeCustomFields();
                            } else {
                                SweetAlert.swal($filter("translate")("api.failedToApiAutoCompleteIssueStatus"), result.data.message.message, "error"); // "설정 실패"
                            }
@@ -403,6 +400,7 @@
                    if (tab === "API_COL_SETTING") {
                        $scope.fn.onChangeColumnSetting();
                    } else if (tab === "API_OVERLAP_SETTING") {
                        $scope.fn.getIssueStatuses();
                        $scope.fn.onChangeIssueTypeOverlap();
                    } else if (tab === "API_SPEC_SETTING") {
                        $scope.fn.onChangeIssueTypeSpec();

 src/main/webapp/scripts/main.js

@@ -4,7 +4,7 @@
'use strict';

require.config({
    urlArgs : "bust=v1.0.0",
    urlArgs : "bust=v0.9.0",
    paths : {
        'jquery' : '../bower_components/jquery/dist/jquery',
        'jquery-ui' : '../bower_components/jquery-ui/jquery-ui',

 src/main/webapp/views/api/apiSettingOverlap.html

@@ -62,7 +62,7 @@
                    class="form-control input-sm issue-select-label"
                    ng-style="{ 'color' : fn.getOptionColor(vm.completeIssueStatuses, vm.completeIssueStatusId) }"
                    ng-model="vm.completeIssueStatusId"
                    ng-change="fn.onChangeIssueTypeSpec()"
                    ng-change="fn.onChangeIssueTypeOverlap()"
                    required>
                <option ng-repeat="issueStatus in vm.completeIssueStatuses"
                        ng-style="{ 'color' : issueStatus.color, 'font-weight': 600 }"