~jhpark/owl-kisa.git - maprexDevGit

부모: 3dcb9484 | 패치 | 커밋 | ignore whitespace

wyu

2021-11-30 862e04dc9c3e817b44a10431221fe9e135d9bd95

사용자 정의 필드 날짜관련 수정

5개 파일 변경됨

	src/main/webapp/scripts/app/customField/customFieldAdd.controller.js	49 ●●●●● 패치 \| 보기 \| raw \| blame \| 히스토리
	src/main/webapp/scripts/components/utils/autoComplete.controller.js	9 ●●●●● 패치 \| 보기 \| raw \| blame \| 히스토리
	src/main/webapp/scripts/components/utils/dateRangePicker.directive.js	54 ●●●●● 패치 \| 보기 \| raw \| blame \| 히스토리
	src/main/webapp/views/customField/customFieldAdd.html	23 ●●●●● 패치 \| 보기 \| raw \| blame \| 히스토리
	src/main/webapp/views/customField/customFieldModify.html	20 ●●●●● 패치 \| 보기 \| raw \| blame \| 히스토리

 src/main/webapp/scripts/app/customField/customFieldAdd.controller.js

@@ -93,55 +93,6 @@
                    }
                }

                // function chkPhoneType(type) {
                //     var input = $scope.vm.form.tel
                //
                //     //focus out인 경우
                //     //input type을 text로 바꾸고 '-'추가
                //     if(type == 'blur'){
                //         $scope.vm.form.tel;
                //         var phone = chkItemPhone(input);
                //     }
                //
                //     //focus인 경우
                //     //input type을 number로 바꾸고 '-' 제거
                //     if(type == 'focus'){
                //         var phone = input.replace( /-/gi, '');
                //         $scope.vm.form.tel('type', 'number');
                //     }
                //
                //     $scope.vm.form.tel(phone);
                // }
                //
                // function chkItemPhone(temp) {
                //     var number = temp.replace(/[^0-9]/g, "");
                //     var phone = "";
                //
                //     if (number.length < 9) {
                //         return number;
                //     } else if (number.length < 10) {
                //         phone += number.substr(0, 2);
                //         phone += "-";
                //         phone += number.substr(2, 3);
                //         phone += "-";
                //         phone += number.substr(5);
                //     } else if (number.length < 11) {
                //         phone += number.substr(0, 3);
                //         phone += "-";
                //         phone += number.substr(3, 3);
                //         phone += "-";
                //         phone += number.substr(6);
                //     } else {
                //         phone += number.substr(0, 3);
                //         phone += "-";
                //         phone += number.substr(3, 4);
                //         phone += "-";
                //         phone += number.substr(7);
                //     }
                //
                //     return phone;
                // }

                //  폼 체크
                function formCheck(formInvalid) {
                    if (formInvalid) {

 src/main/webapp/scripts/components/utils/autoComplete.controller.js

@@ -126,9 +126,16 @@
                    return deferred.promise;
                }

                function getIssueList(query, excludeList, page, callBack) {
                function getIssueList(query, issueTypeId, excludeList, page, callBack) {
                    var conditions = {
                        name : query,
                        issueTypeIds : (function () {
                            var ids = [];

                            ids.push(issueTypeId);

                            return ids;
                        })(),
                        excludeIds : (function () {
                            var excludeIds = [];


 src/main/webapp/scripts/components/utils/dateRangePicker.directive.js

@@ -55,25 +55,43 @@
                                    options.monthNames = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
                                    break;
                            }

                            if (angular.isDefined($attrs["rangeType"])) {
                                $($element).daterangepicker({
                                    timePicker: false,
                                    autoUpdateInput: true,
                                    autoApply : true,
                                    minDate : minDate,
                                    maxDate : maxDate,
                                    parentEl : $scope.parentEl !== undefined ? $scope.parentEl : "body",
                                    locale: {
                                        format: 'YYYY-MM-DD',
                                        separator: " ~ ",
                                        applyLabel: options.applyLabel,
                                        cancelLabel: options.cancelLabel,
                                        daysOfWeek: options.daysOfWeek,
                                        monthNames: options.monthNames
                                    },
                                    opens : "center"
                                });
                                if ($attrs["rangeType"] === "date")
                                {
                                    $($element).daterangepicker({
                                        timePicker: false,
                                        autoUpdateInput: true,
                                        autoApply: true,
                                        minDate: minDate,
                                        maxDate: maxDate,
                                        parentEl: $scope.parentEl !== undefined ? $scope.parentEl : "body",
                                        locale: {
                                            format: 'YYYY-MM-DD',
                                            separator: " ~ ",
                                            applyLabel: options.applyLabel,
                                            cancelLabel: options.cancelLabel,
                                            daysOfWeek: options.daysOfWeek,
                                            monthNames: options.monthNames
                                        },
                                        opens: "center"
                                    });
                                } else if ($attrs["rangeType"] === "singleDate") {
                                    $($element).daterangepicker({
                                        timePicker: false,
                                        autoUpdateInput: true,
                                        autoApply : true,
                                        singleDatePicker : true,
                                        //parentEl : $scope.parentEl !== undefined ? $scope.parentEl : "",
                                        locale: {
                                            format: 'YYYY-MM-DD',
                                            applyLabel: options.applyLabel,
                                            cancelLabel: options.cancelLabel,
                                            daysOfWeek: options.daysOfWeek,
                                            monthNames: options.monthNames
                                        },
                                        opens : "center"
                                    });
                                }
                            }
                            else {
                                $($element).daterangepicker({

 src/main/webapp/views/customField/customFieldAdd.html

@@ -105,21 +105,22 @@
                       placeholder="숫자만 입력 가능합니다."
                       autocomplete="off"
                       ng-model="vm.form.defaultValue">
                <div ng-show="customFieldAddForm.ipAdress.$error.pattern" class="help-block form-text text-danger"
                <div ng-show="customFieldAddForm.numberType.$error.pattern" class="help-block form-text text-danger"
                     translate="common.invalidNumberFormat">숫자만 입력 가능합니다.
                </div>

                <input ng-if="vm.form.customFieldType == 'DATETIME'"
                       name="dateTime"
                       type="text"
                       class="form-control"
                       kr-input
                       ng-pattern="/^(19|20)\d{2}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[0-1])$/"
                       placeholder="날짜 형식만 입력 가능합니다."
                       autocomplete="off"
                       ng-model="vm.form.defaultValue">
                <div ng-show="customFieldAddForm.dateTime.$error.pattern" class="help-block form-text text-danger"
                     translate="common.invalidDateFormat">날짜 형식이 맞지 않습니다.(xxxx-xx-xx)
                       class="form-control input-readonly"
                       ng-model="vm.form.defaultValue"
                       modal-form-auto-scroll
                       range-type="singleDate"
                       onfocus="this.blur()"
                       date-range-picker>
                <div class="row">
                    <div class="col-xs-12">
                        <div id="createdWidget" class="bootstrap-datepicker"></div>
                    </div>
                </div>

                <input ng-if="vm.form.customFieldType == 'IP_ADDRESS'"
@@ -155,7 +156,7 @@
                       class="form-control"
                       maxlength="30"
                       kr-input
                       ng-pattern="/(http(s)?:\/\/)([a-z0-9\w]+\.*)+[a-z0-9]{2,4}/gi"
                       ng-pattern="/((http|https):\/\/)?(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/"
                       placeholder="홈페이지 주소 형식만 입력 가능합니다."
                       autocomplete="off"
                       ng-model="vm.form.defaultValue">

 src/main/webapp/views/customField/customFieldModify.html

@@ -111,15 +111,17 @@
                </div>

                <input ng-if="vm.form.customFieldType == 'DATETIME'"
                       type="text"
                       class="form-control"
                       kr-input
                       ng-pattern="/^(19|20)\d{2}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[0-1])$/"
                       placeholder="날짜 형식만 입력 가능합니다."
                       autocomplete="off"
                       ng-model="vm.form.defaultValue">
                <div ng-show="customFieldAddForm.ipAdress.$error.pattern" class="help-block form-text text-danger"
                     translate="common.invalidDateFormat">날짜 형식이 맞지 않습니다.(19|20년도 월은 1~12 일자는 31까지 입력가능합니다.)
                       name="dateTime"
                       class="form-control input-readonly"
                       ng-model="vm.form.defaultValue"
                       modal-form-auto-scroll
                       range-type="singleDate"
                       onfocus="this.blur()"
                       date-range-picker>
                <div class="row">
                    <div class="col-xs-12">
                        <div id="createdWidget" class="bootstrap-datepicker"></div>
                    </div>
                </div>

                <input ng-if="vm.form.customFieldType == 'IP_ADDRESS'"

			@@ -93,55 +93,6 @@
			}
			}

			// function chkPhoneType(type) {
			// var input = $scope.vm.form.tel
			//
			// //focus out인 경우
			// //input type을 text로 바꾸고 '-'추가
			// if(type == 'blur'){
			// $scope.vm.form.tel;
			// var phone = chkItemPhone(input);
			// }
			//
			// //focus인 경우
			// //input type을 number로 바꾸고 '-' 제거
			// if(type == 'focus'){
			// var phone = input.replace( /-/gi, '');
			// $scope.vm.form.tel('type', 'number');
			// }
			//
			// $scope.vm.form.tel(phone);
			// }
			//
			// function chkItemPhone(temp) {
			// var number = temp.replace(/[^0-9]/g, "");
			// var phone = "";
			//
			// if (number.length < 9) {
			// return number;
			// } else if (number.length < 10) {
			// phone += number.substr(0, 2);
			// phone += "-";
			// phone += number.substr(2, 3);
			// phone += "-";
			// phone += number.substr(5);
			// } else if (number.length < 11) {
			// phone += number.substr(0, 3);
			// phone += "-";
			// phone += number.substr(3, 3);
			// phone += "-";
			// phone += number.substr(6);
			// } else {
			// phone += number.substr(0, 3);
			// phone += "-";
			// phone += number.substr(3, 4);
			// phone += "-";
			// phone += number.substr(7);
			// }
			//
			// return phone;
			// }

			// 폼 체크
			function formCheck(formInvalid) {
			if (formInvalid) {

			@@ -126,9 +126,16 @@
			return deferred.promise;
			}

			function getIssueList(query, excludeList, page, callBack) {
			function getIssueList(query, issueTypeId, excludeList, page, callBack) {
			var conditions = {
			name : query,
			issueTypeIds : (function () {
			var ids = [];

			ids.push(issueTypeId);

			return ids;
			})(),
			excludeIds : (function () {
			var excludeIds = [];

			@@ -55,25 +55,43 @@
			options.monthNames = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
			break;
			}

			if (angular.isDefined($attrs["rangeType"])) {
			$($element).daterangepicker({
			timePicker: false,
			autoUpdateInput: true,
			autoApply : true,
			minDate : minDate,
			maxDate : maxDate,
			parentEl : $scope.parentEl !== undefined ? $scope.parentEl : "body",
			locale: {
			format: 'YYYY-MM-DD',
			separator: " ~ ",
			applyLabel: options.applyLabel,
			cancelLabel: options.cancelLabel,
			daysOfWeek: options.daysOfWeek,
			monthNames: options.monthNames
			},
			opens : "center"
			});
			if ($attrs["rangeType"] === "date")
			{
			$($element).daterangepicker({
			timePicker: false,
			autoUpdateInput: true,
			autoApply: true,
			minDate: minDate,
			maxDate: maxDate,
			parentEl: $scope.parentEl !== undefined ? $scope.parentEl : "body",
			locale: {
			format: 'YYYY-MM-DD',
			separator: " ~ ",
			applyLabel: options.applyLabel,
			cancelLabel: options.cancelLabel,
			daysOfWeek: options.daysOfWeek,
			monthNames: options.monthNames
			},
			opens: "center"
			});
			} else if ($attrs["rangeType"] === "singleDate") {
			$($element).daterangepicker({
			timePicker: false,
			autoUpdateInput: true,
			autoApply : true,
			singleDatePicker : true,
			//parentEl : $scope.parentEl !== undefined ? $scope.parentEl : "",
			locale: {
			format: 'YYYY-MM-DD',
			applyLabel: options.applyLabel,
			cancelLabel: options.cancelLabel,
			daysOfWeek: options.daysOfWeek,
			monthNames: options.monthNames
			},
			opens : "center"
			});
			}
			}
			else {
			$($element).daterangepicker({

			@@ -105,21 +105,22 @@
			placeholder="숫자만 입력 가능합니다."
			autocomplete="off"
			ng-model="vm.form.defaultValue">
			<div ng-show="customFieldAddForm.ipAdress.$error.pattern" class="help-block form-text text-danger"
			<div ng-show="customFieldAddForm.numberType.$error.pattern" class="help-block form-text text-danger"
			translate="common.invalidNumberFormat">숫자만 입력 가능합니다.
			</div>

			<input ng-if="vm.form.customFieldType == 'DATETIME'"
			name="dateTime"
			type="text"
			class="form-control"
			kr-input
			ng-pattern="/^(19\|20)\d{2}-(0[1-9]\|1[012])-(0[1-9]\|[12][0-9]\|3[0-1])$/"
			placeholder="날짜 형식만 입력 가능합니다."
			autocomplete="off"
			ng-model="vm.form.defaultValue">
			<div ng-show="customFieldAddForm.dateTime.$error.pattern" class="help-block form-text text-danger"
			translate="common.invalidDateFormat">날짜 형식이 맞지 않습니다.(xxxx-xx-xx)
			class="form-control input-readonly"
			ng-model="vm.form.defaultValue"
			modal-form-auto-scroll
			range-type="singleDate"
			onfocus="this.blur()"
			date-range-picker>
			<div class="row">
			<div class="col-xs-12">
			<div id="createdWidget" class="bootstrap-datepicker"></div>
			</div>
			</div>

			<input ng-if="vm.form.customFieldType == 'IP_ADDRESS'"
			@@ -155,7 +156,7 @@
			class="form-control"
			maxlength="30"
			kr-input
			ng-pattern="/(http(s)?:\/\/)([a-z0-9\w]+\.*)+[a-z0-9]{2,4}/gi"
			ng-pattern="/((http\|https):\/\/)?(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/\|\/([\w#!:.?+=&%@!\-\/]))?/"
			placeholder="홈페이지 주소 형식만 입력 가능합니다."
			autocomplete="off"
			ng-model="vm.form.defaultValue">

			@@ -111,15 +111,17 @@
			</div>

			<input ng-if="vm.form.customFieldType == 'DATETIME'"
			type="text"
			class="form-control"
			kr-input
			ng-pattern="/^(19\|20)\d{2}-(0[1-9]\|1[012])-(0[1-9]\|[12][0-9]\|3[0-1])$/"
			placeholder="날짜 형식만 입력 가능합니다."
			autocomplete="off"
			ng-model="vm.form.defaultValue">
			<div ng-show="customFieldAddForm.ipAdress.$error.pattern" class="help-block form-text text-danger"
			translate="common.invalidDateFormat">날짜 형식이 맞지 않습니다.(19\|20년도 월은 1~12 일자는 31까지 입력가능합니다.)
			name="dateTime"
			class="form-control input-readonly"
			ng-model="vm.form.defaultValue"
			modal-form-auto-scroll
			range-type="singleDate"
			onfocus="this.blur()"
			date-range-picker>
			<div class="row">
			<div class="col-xs-12">
			<div id="createdWidget" class="bootstrap-datepicker"></div>
			</div>
			</div>

			<input ng-if="vm.form.customFieldType == 'IP_ADDRESS'"