Working on the calendar

This commit is contained in:
Hillel Coren 2017-09-13 16:45:20 +03:00
parent 647c44ee57
commit dda3cd2e9a
4 changed files with 18 additions and 4 deletions

View File

@ -210,6 +210,7 @@ class AccountRepository
$features = array_merge($features, [ $features = array_merge($features, [
['dashboard', '/dashboard'], ['dashboard', '/dashboard'],
['reports', '/reports'], ['reports', '/reports'],
['calendar', '/calendar'],
['customize_design', '/settings/customize_design'], ['customize_design', '/settings/customize_design'],
['new_tax_rate', '/tax_rates/create'], ['new_tax_rate', '/tax_rates/create'],
['new_product', '/products/create'], ['new_product', '/products/create'],

View File

@ -50,8 +50,11 @@
$(function() { $(function() {
var lastFilter = false; var lastFilter = false;
var lastView = 'month';
if (isStorageSupported()) { if (isStorageSupported()) {
lastFilter = JSON.parse(localStorage.getItem('last:calendar_filter')); lastFilter = JSON.parse(localStorage.getItem('last:calendar_filter'));
lastView = localStorage.getItem('last:calendar_view');
} }
// Setup state/status filter // Setup state/status filter
@ -69,6 +72,12 @@
$('#calendar').fullCalendar({ $('#calendar').fullCalendar({
locale: '{{ App::getLocale() }}', locale: '{{ App::getLocale() }}',
firstDay: {{ $account->start_of_week ?: '0' }}, firstDay: {{ $account->start_of_week ?: '0' }},
defaultView: lastView,
viewRender: function(view, element) {
if (isStorageSupported()) {
localStorage.setItem('last:calendar_view', view.name);
}
},
header: { header: {
left: 'prev,next today', left: 'prev,next today',
center: 'title', center: 'title',

View File

@ -159,6 +159,10 @@
location.href = "{{ url('/dashboard') }}"; location.href = "{{ url('/dashboard') }}";
}); });
Mousetrap.bind('g c', function(e) {
location.href = "{{ url('/calendar') }}";
});
Mousetrap.bind('g r', function(e) { Mousetrap.bind('g r', function(e) {
location.href = "{{ url('/reports') }}"; location.href = "{{ url('/reports') }}";
}); });

View File

@ -274,14 +274,14 @@
function setFiltersShown() { function setFiltersShown() {
var val = $('#report_type').val(); var val = $('#report_type').val();
if (val == '{{ ENTITY_TAX_RATE }}') { if (val == '{{ ENTITY_TAX_RATE }}') {
$('#dateField').fadeIn(); $('#dateField').show();
} else { } else {
$('#dateField').fadeOut(); $('#dateField').hide();
} }
if (val == '{{ ENTITY_INVOICE }}' || val == '{{ ENTITY_PRODUCT }}') { if (val == '{{ ENTITY_INVOICE }}' || val == '{{ ENTITY_PRODUCT }}') {
$('#statusField').fadeIn(); $('#statusField').show();
} else { } else {
$('#statusField').fadeOut(); $('#statusField').hide();
} }
} }