From 862e04dc9c3e817b44a10431221fe9e135d9bd95 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 화, 30 11월 2021 12:45:32 +0900
Subject: [PATCH] 사용자 정의 필드 날짜관련 수정
---
src/main/webapp/scripts/components/utils/autoComplete.controller.js | 9 ++
src/main/webapp/views/customField/customFieldAdd.html | 23 ++++---
src/main/webapp/views/customField/customFieldModify.html | 20 +++---
src/main/webapp/scripts/components/utils/dateRangePicker.directive.js | 54 ++++++++++++------
src/main/webapp/scripts/app/customField/customFieldAdd.controller.js | 49 ----------------
5 files changed, 67 insertions(+), 88 deletions(-)
diff --git a/src/main/webapp/scripts/app/customField/customFieldAdd.controller.js b/src/main/webapp/scripts/app/customField/customFieldAdd.controller.js
index 37838b8..018b3c8 100644
--- a/src/main/webapp/scripts/app/customField/customFieldAdd.controller.js
+++ b/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) {
diff --git a/src/main/webapp/scripts/components/utils/autoComplete.controller.js b/src/main/webapp/scripts/components/utils/autoComplete.controller.js
index d1020b8..ef94066 100644
--- a/src/main/webapp/scripts/components/utils/autoComplete.controller.js
+++ b/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 = [];
diff --git a/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js b/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
index 04eae5d..d6367d5 100644
--- a/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
+++ b/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({
diff --git a/src/main/webapp/views/customField/customFieldAdd.html b/src/main/webapp/views/customField/customFieldAdd.html
index ec866c6..53b129e 100644
--- a/src/main/webapp/views/customField/customFieldAdd.html
+++ b/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">
diff --git a/src/main/webapp/views/customField/customFieldModify.html b/src/main/webapp/views/customField/customFieldModify.html
index 8af0dcd..1360aed 100644
--- a/src/main/webapp/views/customField/customFieldModify.html
+++ b/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'"
--
Gitblit v1.8.0