From 57b7f271f8bba85ea161a609ed5e01dd9495fed7 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 27 1월 2022 18:01:54 +0900
Subject: [PATCH] - 이슈 상태명 특수문자 입력 가능하도록 수정 - 이슈유형 리스트에서 파트너 정보 보여주기
---
src/main/webapp/scripts/components/utils/dateRangePicker.directive.js | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js b/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
index 7be0571..b5f5eaf 100644
--- a/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
+++ b/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
@@ -77,7 +77,9 @@
});
} else if ($attrs["rangeType"] === "singleDate") {
$($element).daterangepicker({
- timePicker: false,
+ timePicker: true,
+ timePicker24Hour : true,
+ timePickerSeconds : true,
autoUpdateInput: true,
autoApply : true,
singleDatePicker : true,
@@ -85,7 +87,33 @@
//parentEl : $scope.parentEl !== undefined ? $scope.parentEl : "",
locale: {
- format: 'YYYY-MM-DD',
+ format: 'YYYY-MM-DD H:mm:ss',
+ separator: "~",
+ applyLabel: options.applyLabel,
+ cancelLabel: options.cancelLabel,
+ daysOfWeek: options.daysOfWeek,
+ monthNames: options.monthNames
+ },
+ opens : "center"
+ });
+ // singleDate 痍⑥냼 踰꾪듉 (媛� 珥덇린�솕)
+ $($element).on('cancel.daterangepicker', function(ev, picker) {
+ $scope.ngModel = "";
+ });
+ } else if ($attrs["rangeType"] === "multiDate") {
+ $($element).daterangepicker({
+ timePicker: true,
+ timePicker24Hour : true,
+ timePickerSeconds : true,
+ autoUpdateInput: true,
+ autoApply : true,
+ singleDatePicker : false,
+ isSingle : false,
+
+ //parentEl : $scope.parentEl !== undefined ? $scope.parentEl : "",
+ locale: {
+ format: 'YYYY-MM-DD H:mm:ss',
+ separator: "~",
applyLabel: options.applyLabel,
cancelLabel: options.cancelLabel,
daysOfWeek: options.daysOfWeek,
--
Gitblit v1.8.0