Skip to content
This repository was archived by the owner on Mar 6, 2023. It is now read-only.

Commit d209805

Browse files
committed
Fixed a few bugs with manual date selection
Issue #12
1 parent 47a137b commit d209805

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

src/components/date-filter/custom-date-range-controller.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,15 @@
1414
return;
1515
}
1616

17-
if ((vm.range.start.toDate() === vm.range.end.toDate()) || (vm.maxDate.toDate() === vm.range.end.toDate())) {
17+
if (!angular.isObject(vm.range.start)) {
18+
vm.range.start = moment(vm.range.start);
19+
}
20+
21+
if (!angular.isObject(vm.range.end)) {
22+
vm.range.end = moment(vm.range.end);
23+
}
24+
25+
if ((vm.range.start.diff(vm.range.end, 'seconds') === 0) || (vm.maxDate.diff(vm.range.end, 'seconds') === 0)) {
1826
vm.range.end = vm.range.end.endOf('day');
1927
}
2028

src/components/date-filter/custom-date-range-dialog.tpl.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ <h4 class="modal-title">Select Date Range</h4>
99
min-date="vm.minDate"
1010
max-date="vm.maxDate"
1111
time-picker="true"
12+
time-picker-seconds="true"
1213
time-picker12-hour="true">
1314
</date-range-picker>
1415
</div>

src/components/date-range-picker/date-range-picker-directive.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
range: '=',
1515
showDropdowns: '=',
1616
timePicker: '=',
17+
timePickerSeconds: '=',
1718
timePicker12Hour: '='
1819
},
1920
templateUrl: 'components/date-range-picker/date-range-picker-directive.tpl.html',
@@ -28,6 +29,7 @@
2829
startDate: vm.range.start,
2930
timePicker: !!vm.timePicker,
3031
timePicker12Hour: !!vm.timePicker12Hour,
32+
timePickerSeconds: !!vm.timePickerSeconds,
3133
timePickerIncrement: vm.timePickerIncrement || 1
3234
};
3335

0 commit comments

Comments
 (0)