andi/perfdb
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Activity

add new ranges for date picker

Browse Source
This commit is contained in:
Andreas Huber
2019-08-25 10:40:05 +02:00
parent 2cd0d71dde
commit da97a13ed8
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pdb-ui/src/main/resources/resources/js/ui.js
View File

@@ -605,7 +605,7 @@ Vue.component('search-bar', {
$('#search-date-range').daterangepicker({ $('#search-date-range').daterangepicker({
timePicker: true, timePicker: true,
minDate: "2017-01-01", minDate: "2017-01-01",
maxDate: moment(), maxDate: moment().endOf('year'),
maxYear: parseInt(moment().format('YYYY'),10), maxYear: parseInt(moment().format('YYYY'),10),
timePicker24Hour: true, timePicker24Hour: true,
timePickerSeconds: 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 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')], 'Last 30 Days': [moment().subtract(29, 'days').startOf('day'), moment().endOf('day')],
'This Month': [moment().startOf('month'), moment().endOf('month').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) { $('#search-date-range').on('apply.daterangepicker', function(ev, picker) {