From 15fb5ce02c159e88059b95aa62db1e037f358fdf Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 수, 01 12월 2021 18:28:58 +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 | 54 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 36 insertions(+), 18 deletions(-)
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({
--
Gitblit v1.8.0