Browse Source

Improve date picker for Events and Home page

pull/41/head
Berkan Sasmaz 5 years ago
parent
commit
824e241dca
  1. 25
      src/EventHub.Web/Pages/Events/Index.js
  2. 23
      src/EventHub.Web/Pages/Index.js

25
src/EventHub.Web/Pages/Events/Index.js

@ -18,6 +18,14 @@ $(function () {
function cb(start, end) { function cb(start, end) {
$('#reportrange span').html(start.format('MMMM D, YYYY') + ' - ' + end.format('MMMM D, YYYY')); $('#reportrange span').html(start.format('MMMM D, YYYY') + ' - ' + end.format('MMMM D, YYYY'));
} }
function getRanges() {
return {
'Today': [moment(), moment()],
'Tomorow': [moment().add(1, 'days'), moment().add(1, 'days')],
'Next 7 Days': [moment(), moment().add(6, 'days')],
};
}
var when = $("#WhenInput"); var when = $("#WhenInput");
if (minDate !== null && maxDate !== null && minDate.length > 0 && maxDate.length > 0){ if (minDate !== null && maxDate !== null && minDate.length > 0 && maxDate.length > 0){
@ -31,13 +39,7 @@ $(function () {
locale: { locale: {
cancelLabel: 'Clear' cancelLabel: 'Clear'
}, },
ranges: { ranges: getRanges()
'Today': [moment(), moment()],
'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
'Last 7 Days': [moment().subtract(6, 'days'), moment()],
'This Month': [moment().startOf('month'), moment().endOf('month')],
'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')]
}
}, cb); }, cb);
}else { }else {
when.daterangepicker({ when.daterangepicker({
@ -45,14 +47,7 @@ $(function () {
locale: { locale: {
cancelLabel: 'Clear' cancelLabel: 'Clear'
}, },
ranges: { ranges: getRanges()
'Today': [moment(), moment()],
'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
'Last 7 Days': [moment().subtract(6, 'days'), moment()],
'Last 30 Days': [moment().subtract(29, 'days'), moment()],
'This Month': [moment().startOf('month'), moment().endOf('month')],
'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')]
}
}, cb); }, cb);
} }

23
src/EventHub.Web/Pages/Index.js

@ -26,24 +26,35 @@
}, },
dots: true, dots: true,
}); });
var minDate = "" function cb(start, end) {
var maxDate = "" $('#reportrange span').html(start.format('MMMM D, YYYY') + ' - ' + end.format('MMMM D, YYYY'));
}
var minDate = moment();
var maxDate = moment();
var $inputWhen = $("#inputWhen"); var $inputWhen = $("#inputWhen");
$inputWhen.daterangepicker({ $inputWhen.daterangepicker({
startDate: minDate,
endDate: maxDate,
autoUpdateInput: false, autoUpdateInput: false,
locale: { locale: {
cancelLabel: 'Clear' cancelLabel: 'Clear'
},
ranges: {
'Today': [moment(), moment()],
'Tomorow': [moment().add(1, 'days'), moment().add(1, 'days')],
'Next 7 Days': [moment(), moment().add(6, 'days')],
} }
}); }, cb);
$inputWhen.on('apply.daterangepicker', function(ev, picker) { $inputWhen.on('apply.daterangepicker', function(ev, picker) {
$(this).val(picker.startDate.format('MM/DD/YYYY') + ' - ' + picker.endDate.format('MM/DD/YYYY')); $(this).val(picker.startDate.format('MM/DD/YYYY') + ' - ' + picker.endDate.format('MM/DD/YYYY'));
minDate = picker.startDate.format('MM/DD/YYYY') minDate = picker.startDate.format('MM/DD/YYYY')
maxDate = picker.endDate.format('MM/DD/YYYY') maxDate = picker.endDate.format('MM/DD/YYYY')
}); });
$inputWhen.on('cancel.daterangepicker', function(ev, picker) { $inputWhen.on('cancel.daterangepicker', function(ev, picker) {
$(this).val(''); $(this).val('');
minDate = "" minDate = ""

Loading…
Cancel
Save