From 4ebcb8699bc07c8c5baced88f3930bea212f5c58 Mon Sep 17 00:00:00 2001 From: Denny Lim Date: Wed, 4 Dec 2013 05:37:27 +0000 Subject: [PATCH] =?UTF-8?q?[=EC=9E=84=EB=8C=80=ED=98=84]=20[NOBTS]=20navba?= =?UTF-8?q?r=20period=20=EC=B5=9C=EB=8C=80=202=EC=9D=BC=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://svn.bds.nhncorp.com/pe/hippo-web/trunk@2980 84d0f5b1-2673-498c-a247-62c4ff18d310 --- src/main/webapp/scripts/directives/navbar.js | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/main/webapp/scripts/directives/navbar.js b/src/main/webapp/scripts/directives/navbar.js index e8893cf94..45d57f105 100644 --- a/src/main/webapp/scripts/directives/navbar.js +++ b/src/main/webapp/scripts/directives/navbar.js @@ -21,7 +21,7 @@ pinpointApp.directive('navbar', [ 'cfg', '$rootScope', '$http', // define private variables of methods var initialize, initializeDateTimePicker, initializeApplication, setDateTime, getQueryEndTimeFromServer, broadcast, getApplicationList, getQueryStartTime, getQueryEndTime, parseApplicationList, emitAsChanged, - initializeWithStaticApplication, getPeriodType, setPeriodTypeAsCurrent; + initializeWithStaticApplication, getPeriodType, setPeriodTypeAsCurrent, getDate; scope.showNavbar = false; scope.periodDelay = false; @@ -87,7 +87,10 @@ pinpointApp.directive('navbar', [ 'cfg', '$rootScope', '$http', dateFormat: "yy-mm-dd", timeFormat: "hh:mm tt", onSelect: function () { - $toPicker.datetimepicker('option', 'minDate', $fromPicker.datetimepicker('getDate')); +// $toPicker.datetimepicker('option', 'minDate', $fromPicker.datetimepicker('getDate')); + if (getDate($fromPicker).isBefore(getDate($toPicker).add(-2).days()) || getDate($fromPicker).isAfter(getDate($toPicker))) { + setDateTime($toPicker, getDate($fromPicker).add(2).days()); + } }, onClose: function (currentTime, oTime) { if ($toPicker.val() !== '') { @@ -106,7 +109,10 @@ pinpointApp.directive('navbar', [ 'cfg', '$rootScope', '$http', dateFormat: "yy-mm-dd", timeFormat: "hh:mm tt", onSelect: function () { - $fromPicker.datetimepicker('option', 'maxDate', $toPicker.datetimepicker('getDate')); +// $fromPicker.datetimepicker('option', 'maxDate', $toPicker.datetimepicker('getDate')); + if (getDate($fromPicker).isBefore(getDate($toPicker).add(-2).days()) || getDate($fromPicker).isAfter(getDate($toPicker))) { + setDateTime($fromPicker, getDate($toPicker).add(-2).days()); + } }, onClose: function (currentTime, oTime) { if ($fromPicker.val() !== '') { @@ -120,8 +126,12 @@ pinpointApp.directive('navbar', [ 'cfg', '$rootScope', '$http', }); setDateTime($toPicker, oNavbarVo.getQueryEndTime()); - $fromPicker.datetimepicker('option', 'maxDate', $toPicker.datetimepicker('getDate')); - $toPicker.datetimepicker('option', 'minDate', $fromPicker.datetimepicker('getDate')); +// $fromPicker.datetimepicker('option', 'maxDate', $toPicker.datetimepicker('getDate')); +// $toPicker.datetimepicker('option', 'minDate', $fromPicker.datetimepicker('getDate')); + }; + + getDate = function ($picker) { + return $picker.datetimepicker('getDate'); }; /**