From 9b779cda3f7e72ce750e8df322b736384450d0db Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 금, 24 12월 2021 11:09:18 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/scripts/components/utils/dateRangePicker.directive.js | 5 +++--
1 files changed, 3 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..d39030e 100644
--- a/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
+++ b/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
@@ -77,7 +77,8 @@
});
} else if ($attrs["rangeType"] === "singleDate") {
$($element).daterangepicker({
- timePicker: false,
+ timePicker: true,
+ timePickerSeconds : true,
autoUpdateInput: true,
autoApply : true,
singleDatePicker : true,
@@ -85,7 +86,7 @@
//parentEl : $scope.parentEl !== undefined ? $scope.parentEl : "",
locale: {
- format: 'YYYY-MM-DD',
+ format: 'YYYY-MM-DD/hh:mm:ss A',
applyLabel: options.applyLabel,
cancelLabel: options.cancelLabel,
daysOfWeek: options.daysOfWeek,
--
Gitblit v1.8.0