OWL ITS + 탐지시스템(인터넷 진흥원)
이민희
2022-01-24 7f5428f3897cf22c34a00829a8eae6f260669999
- 24시간제로 적용 안되는 문제 해결
- 문자열필드 maxlength 제거
12개 파일 변경됨
57 ■■■■ 파일 변경됨
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java 6 ●●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/custom_components/js-autocomplete-single/js-autocomplete-single.js 6 ●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/scripts/app/issue/issueAdd.controller.js 17 ●●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/scripts/components/utils/dateRangePicker.directive.js 8 ●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/views/customField/customFieldAdd.html 6 ●●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/views/customField/customFieldModify.html 6 ●●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/views/issue/issueAdd.html 1 ●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/views/issue/issueAddDown.html 1 ●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/views/issue/issueAddRelation.html 1 ●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/views/issue/issueListNormal.html 2 ●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/views/issue/issueListTimeline.html 2 ●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/views/issue/issueModify.html 1 ●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -48,6 +48,8 @@
import java.io.IOException;
import java.util.*;
import static kr.wisestone.owl.domain.enumType.CustomFieldType.INPUT;
@Service
public class IssueServiceImpl extends AbstractServiceImpl<Issue, Long, JpaRepository<Issue, Long>> implements IssueService {
@@ -809,7 +811,7 @@
                useValues.add(issueCustomFieldValueVo.getUseValue());
                customField.put(issueCustomFieldValueVo.getCustomFieldVo().getName(), useValues);
            } else {
                if (issueCustomFieldValueVo.getCustomFieldVo().getCustomFieldType().equals(CustomFieldType.INPUT.toString())) {
                if (issueCustomFieldValueVo.getCustomFieldVo().getCustomFieldType().equals(INPUT.toString())) {
                    customField.put(issueCustomFieldValueVo.getCustomFieldVo().getName(), issueCustomFieldValueVo.getUseValue());
                } else {
                    customField.put(issueCustomFieldValueVo.getCustomFieldVo().getName(), Lists.newArrayList(issueCustomFieldValueVo.getUseValue()));
@@ -3555,7 +3557,7 @@
                case EMAIL:
                case SITE:
                case TEL:
                    if (cellValue.length() > 100) {
                    if (customField.getCustomFieldType() != INPUT && cellValue.length() > 100) {
                        throw new OwlRuntimeException(
                                this.messageAccessor.getMessage(MsgConstants.CUSTOM_FIELD_TEXT_TYPE_MAX_LENGTH_OUT));
                    }
src/main/webapp/custom_components/js-autocomplete-single/js-autocomplete-single.js
@@ -22,7 +22,7 @@
                source : '&',
                page : "=",
                totalPage : "=",
                inputDisabled : "=",
                inputDisabled : "=?",
                customInput : "=",
            },
            templateUrl : "custom_components/js-autocomplete-single/js-autocomplete-single.html",
@@ -31,7 +31,7 @@
                var blank_pattern = /^\s+|\s+$/g;
                //  입력 필드 비활성화
                if (!angular.isDefined($scope.inputDisabled)) {
                if (!$rootScope.isDefined($scope.inputDisabled)) {
                    $scope.inputDisabled = false;
                }
@@ -227,7 +227,7 @@
                function toggleDropdown() {
                    //  아이템이 선택되어 있을 경우 목록 레이어는 표시될 수 없다.
                    $scope.open = true;
                    if ($scope.selectedModel != null && $scope.selectedModel.length > 0) {
                    if ($rootScope.isDefined($scope.selectedModel) && $scope.selectedModel.length > 0) {
                        $scope.open = false;
                        $scope.options = [];
                    }
src/main/webapp/scripts/app/issue/issueAdd.controller.js
@@ -849,9 +849,11 @@
                        $resourceProvider.getPageContent(0, 1000))).then(function (result) {
                        if (result.data.message.status === "success") {
                            $scope.vm.form.projects.push(result.data.data);
                            $scope.vm.projectName = result.data.data.name;
                            $scope.fn.getIssueTypeOfProject();
                            if ($rootScope.isDefined(result.data.data)) {
                                $scope.vm.form.projects.push(result.data.data);
                                $scope.vm.projectName = result.data.data.name;
                                $scope.fn.getIssueTypeOfProject();
                            }
                        }
                        else {
                            SweetAlert.swal($filter("translate")("issue.failedToIssueTypeListLookup"), result.data.message.message, "error"); // 이슈 타입 목록 조회 실패
@@ -867,9 +869,9 @@
                function getIssueTypes() {
                    var deferred = $q.defer();
                    /*if (!$rootScope.isDefined($scope.vm.form.projects[0])) {
                    if (!$rootScope.isDefined($scope.vm.form.projects[0])) {
                        return;
                    }*/
                    }
                    IssueType.find($resourceProvider.getContent({},
                        $resourceProvider.getPageContent(0, 1000))).then(function (result) {
@@ -896,6 +898,7 @@
                        if (result.data.message.status === "success") {
                            $scope.vm.issueTypes = result.data.data;
                            //$scope.fn.getIssueTypeCustomFields();
                        }
                        else {
                            SweetAlert.swal($filter("translate")("issue.failedToIssueTypeListLookup"), result.data.message.message, "error"); // 이슈 타입 목록 조회 실패
@@ -1046,7 +1049,7 @@
                }
                function getPartners() {
                    if($scope.vm.form.issueTypeId === ""){
                    if($scope.vm.form.issueTypeId === "" && $rootScope.issueTypeMenu != null){
                        $scope.vm.form.issueTypeId = $rootScope.issueTypeMenu.id
                    }
                    var content = {
@@ -1062,7 +1065,7 @@
                }
                function getDepartments() {
                    if($scope.vm.form.issueTypeId === ""){
                    if($scope.vm.form.issueTypeId === "" && $rootScope.issueTypeMenu != null){
                        $scope.vm.form.issueTypeId = $rootScope.issueTypeMenu.id
                    }
                    var content = {
src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
@@ -77,8 +77,8 @@
                                    });
                                } else if ($attrs["rangeType"] === "singleDate") {
                                    $($element).daterangepicker({
                                        timePicker24Hour : true,
                                        timePicker: true,
                                        timePicker24Hour : true,
                                        timePickerSeconds : true,
                                        autoUpdateInput: true,
                                        autoApply : true,
@@ -87,7 +87,7 @@
                                        //parentEl : $scope.parentEl !== undefined ? $scope.parentEl : "",
                                        locale: {
                                            format: 'YYYY-MM-DD hh:mm:ss',
                                            format: 'YYYY-MM-DD H:mm:ss',
                                            separator: "~",
                                            applyLabel: options.applyLabel,
                                            cancelLabel: options.cancelLabel,
@@ -102,8 +102,8 @@
                                    });
                                } else if ($attrs["rangeType"] === "multiDate") {
                                    $($element).daterangepicker({
                                        timePicker24Hour : true,
                                        timePicker: true,
                                        timePicker24Hour : true,
                                        timePickerSeconds : true,
                                        autoUpdateInput: true,
                                        autoApply : true,
@@ -112,7 +112,7 @@
                                        //parentEl : $scope.parentEl !== undefined ? $scope.parentEl : "",
                                        locale: {
                                            format: 'YYYY-MM-DD hh:mm:ss',
                                            format: 'YYYY-MM-DD H:mm:ss',
                                            separator: "~",
                                            applyLabel: options.applyLabel,
                                            cancelLabel: options.cancelLabel,
src/main/webapp/views/customField/customFieldAdd.html
@@ -97,9 +97,7 @@
                       name="defaultValue"
                       class="form-control"
                       ng-model="vm.form.defaultValue"
                       maxlength="100"
                       kr-input
                       ng-maxlength="100"
                       autocomplete="off">
@@ -187,9 +185,9 @@
                     translate="common.invalidTelFormat">전화번호 형식이 맞지 않습니다.
                </div>
                <small ng-if="vm.form.customFieldType == 'INPUT'" translate="common.upTo100Characters">
                <!--<small ng-if="vm.form.customFieldType == 'INPUT'" translate="common.upTo100Characters">
                    최대 100글자까지 입력할 수 있습니다.
                </small>
                </small>-->
                <div class="help-block form-text text-danger" ng-if="vm.form.customFieldType == 'SINGLE_SELECT'"
                     translate="customField.selectSingleFieldListHashTag">
src/main/webapp/views/customField/customFieldModify.html
@@ -99,9 +99,7 @@
                       name="defaultValue"
                       class="form-control"
                       ng-model="vm.form.defaultValue"
                       maxlength="100"
                       kr-input
                       ng-maxlength="100"
                       autocomplete="off">
                <input ng-if="vm.form.customFieldType == 'NUMBER'"
@@ -191,9 +189,9 @@
<!--                       class="help-block form-text text-danger" translate="common.upTo100Characters">-->
<!--                    최대 100글자까지 입력할 수 있습니다.-->
<!--                </small>-->
                <small ng-if="vm.form.customFieldType == 'INPUT'" translate="common.upTo100Characters">
                <!--<small ng-if="vm.form.customFieldType == 'INPUT'" translate="common.upTo100Characters">
                    최대 100글자까지 입력할 수 있습니다.
                </small>
                </small>-->
                <div class="help-block form-text text-danger" ng-if="vm.form.customFieldType == 'SINGLE_SELECT'"
                     translate="customField.selectSingleFieldListHashTag">
                    단일 선택 필드 목록에 있는 값을 기본적으로 선택하고 싶을 때는 해시태그를 사용해야합니다. ex) #대상값
src/main/webapp/views/issue/issueAdd.html
@@ -239,7 +239,6 @@
                                    <input type="text" class="form-control input-sm"
                                           name="item_{{$index}}"
                                           ng-model="issueCustomField.useValues"
                                           maxlength="100"
                                           autocomplete="off"
                                           kr-input
                                           ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'">
src/main/webapp/views/issue/issueAddDown.html
@@ -237,7 +237,6 @@
                                    <input type="text" class="form-control input-sm"
                                           name="input"
                                           ng-model="issueCustomField.useValues"
                                           maxlength="100"
                                           autocomplete="off"
                                           kr-input
                                           ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'">
src/main/webapp/views/issue/issueAddRelation.html
@@ -249,7 +249,6 @@
                                    <input type="text" class="form-control input-sm"
                                           name="input"
                                           ng-model="issueCustomField.useValues"
                                           maxlength="100"
                                           autocomplete="off"
                                           kr-input
                                           ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'">
src/main/webapp/views/issue/issueListNormal.html
@@ -274,7 +274,7 @@
                                                            <input type="text"
                                                                   class="form-control input-sm"
                                                                   ng-model="customField.useValues"
                                                                   maxlength="100">
                                                                   >
                                                        </div>
                                                        <div ng-switch-when="NUMBER">
                                                            <input type="text"
src/main/webapp/views/issue/issueListTimeline.html
@@ -260,7 +260,7 @@
                                                    <div ng-switch-when="INPUT">
                                                        <input type="text" class="form-control input-sm"
                                                               ng-model="customField.useValues"
                                                               maxlength="100">
                                                               >
                                                    </div>
                                                    <div ng-switch-default>
src/main/webapp/views/issue/issueModify.html
@@ -237,7 +237,6 @@
                                    <input type="text" class="form-control input-sm"
                                           name="item_{{$index}}"
                                           ng-model="issueCustomField.useValues"
                                           maxlength="100"
                                           autocomplete="off"
                                           kr-input
                                           ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'">