home/pinpoint
2
0
Fork 0
mirror of https://github.com/wahyd4/pinpoint.git synced 2026-08-19 01:35:58 +10:00
Code Issues Packages Projects Releases Wiki Activity

[임대현] [NOBTS] navbar period 최대 2일로 변경

Browse Source 
git-svn-id: http://svn.bds.nhncorp.com/pe/hippo-web/trunk@2980 84d0f5b1-2673-498c-a247-62c4ff18d310
This commit is contained in:
Denny Lim
2013-12-04 05:37:27 +00:00
parent 5ee596292b
commit 4ebcb8699b
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/webapp/scripts/directives/navbar.js
+15 -5
View File
@@ -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');
};
/**