diff --git a/pdb-ui/src/main/resources/resources/js/ui.js b/pdb-ui/src/main/resources/resources/js/ui.js index 42c2bf6..a48e656 100644 --- a/pdb-ui/src/main/resources/resources/js/ui.js +++ b/pdb-ui/src/main/resources/resources/js/ui.js @@ -605,7 +605,7 @@ Vue.component('search-bar', { $('#search-date-range').daterangepicker({ timePicker: true, minDate: "2017-01-01", - maxDate: moment(), + maxDate: moment().endOf('year'), maxYear: parseInt(moment().format('YYYY'),10), timePicker24Hour: true, timePickerSeconds: true, @@ -622,7 +622,10 @@ Vue.component('search-bar', { 'Last Week': [moment().subtract(7, 'days').startOf('week'), moment().subtract(7, 'days').endOf('week')], 'Last 30 Days': [moment().subtract(29, 'days').startOf('day'), moment().endOf('day')], 'This Month': [moment().startOf('month'), moment().endOf('month').endOf('day')], - 'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')] + 'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')], + 'Last 3 Months': [moment().subtract(3, 'month').startOf('month'),moment().endOf('month').endOf('day')], + 'This Year': [moment().startOf('year'),moment().endOf('month').endOf('day')], + 'Last Year': [moment().subtract(1, 'year').startOf('year'),moment().subtract(1, 'year').endOf('year')], }, }); $('#search-date-range').on('apply.daterangepicker', function(ev, picker) {