diff --git a/src/assets/css/backend.css b/src/assets/css/backend.css
index efa422c2..8c800388 100644
--- a/src/assets/css/backend.css
+++ b/src/assets/css/backend.css
@@ -416,6 +416,15 @@ body .form-horizontal .controls {
margin-left: 158px;
}
+#calendar .calendar-header {
+ padding: 10px 0;
+}
+
+#calendar .calendar-header .btn,
+#calendar .calendar-header input {
+ margin-right: 10px;
+}
+
#calendar .calendar-view {
overflow-x: scroll;
}
diff --git a/src/assets/js/backend_calendar_table_view.js b/src/assets/js/backend_calendar_table_view.js
index 4b336e0e..3f48e560 100644
--- a/src/assets/js/backend_calendar_table_view.js
+++ b/src/assets/js/backend_calendar_table_view.js
@@ -29,12 +29,14 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {};
$calendar.on('click', '.calendar-header .btn.previous', function() {
var endDate = new Date($('#calendar .date-column:first').data('date')).add({days: -1});
var startDate = new Date(endDate.getTime()).add({days: -1 * (parseInt($('#select-filter-item').val()) - 1)});
+ $('.select-date').datepicker('setDate', startDate);
_createView(startDate, endDate);
});
$calendar.on('click', '.calendar-header .btn.next', function() {
var startDate = new Date($('#calendar .date-column:last').data('date')).add({days: 1});
var endDate = new Date(startDate.getTime()).add({days: parseInt($('#select-filter-item').val()) - 1});
+ $('.select-date').datepicker('setDate', startDate);
_createView(startDate, endDate);
});
@@ -329,10 +331,41 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {};
'' +
+ '' +
''
);
+
+ var dateFormat;
+
+ switch(GlobalVariables.dateFormat) {
+ case 'DMY':
+ dateFormat = 'dd/mm/yy';
+ break;
+
+ case 'MDY':
+ dateFormat = 'mm/dd/yy';
+ break;
+
+ case 'YMD':
+ dateFormat = 'yy/mm/dd';
+ break;
+
+ default:
+ throw new Error('Invalid date format setting provided!', GlobalVariables.dateFormat);
+ }
+
+
+ $calendarHeader.find('.select-date').datepicker({
+ defaultDate: new Date(),
+ dateFormat: dateFormat,
+ onSelect: function(dateText, instance) {
+ var startDate = new Date(instance.currentYear, instance.currentMonth, instance.currentDay);
+ var endDate = new Date(startDate.getTime()).add({days: parseInt($('#select-filter-item').val()) - 1});
+ _createView(startDate, endDate);
+ }
+ });
}
/**