From a11dc4e377730f1ce08bc7210366c21e2833bf05 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 월, 28 2월 2022 18:38:29 +0900
Subject: [PATCH] 1.0.5버전
---
src/main/webapp/scripts/components/utils/dateRangePicker.directive.js | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js b/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
index 1da24db..aee27e2 100644
--- a/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
+++ b/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
@@ -78,6 +78,7 @@
} else if ($attrs["rangeType"] === "singleDate") {
$($element).daterangepicker({
timePicker: true,
+ timePicker24Hour : true,
timePickerSeconds : true,
autoUpdateInput: true,
autoApply : true,
@@ -86,7 +87,7 @@
//parentEl : $scope.parentEl !== undefined ? $scope.parentEl : "",
locale: {
- format: 'YYYY-MM-DD hh:mm:ss',
+ format: 'YYYY-MM-DD HH:mm:ss',
separator: "~",
applyLabel: options.applyLabel,
cancelLabel: options.cancelLabel,
@@ -101,8 +102,8 @@
});
} else if ($attrs["rangeType"] === "multiDate") {
$($element).daterangepicker({
- timePicker24Hour : true,
timePicker: true,
+ timePicker24Hour : true,
timePickerSeconds : true,
autoUpdateInput: true,
autoApply : true,
@@ -111,7 +112,7 @@
//parentEl : $scope.parentEl !== undefined ? $scope.parentEl : "",
locale: {
- format: 'YYYY-MM-DD hh:mm:ss',
+ format: 'YYYY-MM-DD HH:mm:ss',
separator: "~",
applyLabel: options.applyLabel,
cancelLabel: options.cancelLabel,
--
Gitblit v1.8.0