From dda3cd2e9ab133decf84e88e5f68d30438e89122 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 13 Sep 2017 16:45:20 +0300
Subject: [PATCH] Working on the calendar

---
 app/Ninja/Repositories/AccountRepository.php          | 1 +
 resources/views/calendar.blade.php                    | 9 +++++++++
 resources/views/partials/keyboard_shortcuts.blade.php | 4 ++++
 resources/views/reports/chart_builder.blade.php       | 8 ++++----
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/app/Ninja/Repositories/AccountRepository.php b/app/Ninja/Repositories/AccountRepository.php
index 092493794f01..b4fde7c1d4e9 100644
--- a/app/Ninja/Repositories/AccountRepository.php
+++ b/app/Ninja/Repositories/AccountRepository.php
@@ -210,6 +210,7 @@ class AccountRepository
         $features = array_merge($features, [
             ['dashboard', '/dashboard'],
             ['reports', '/reports'],
+            ['calendar', '/calendar'],
             ['customize_design', '/settings/customize_design'],
             ['new_tax_rate', '/tax_rates/create'],
             ['new_product', '/products/create'],
diff --git a/resources/views/calendar.blade.php b/resources/views/calendar.blade.php
index 86a2cc813032..9386299af70b 100644
--- a/resources/views/calendar.blade.php
+++ b/resources/views/calendar.blade.php
@@ -50,8 +50,11 @@
         $(function() {
 
 			var lastFilter = false;
+			var lastView = 'month';
+
 			if (isStorageSupported()) {
 				lastFilter = JSON.parse(localStorage.getItem('last:calendar_filter'));
+				lastView = localStorage.getItem('last:calendar_view');
 			}
 
             // Setup state/status filter
@@ -69,6 +72,12 @@
             $('#calendar').fullCalendar({
 				locale: '{{ App::getLocale() }}',
 				firstDay: {{ $account->start_of_week ?: '0' }},
+				defaultView: lastView,
+				viewRender: function(view, element) {
+					if (isStorageSupported()) {
+						localStorage.setItem('last:calendar_view', view.name);
+					}
+				},
                 header: {
     				left: 'prev,next today',
     				center: 'title',
diff --git a/resources/views/partials/keyboard_shortcuts.blade.php b/resources/views/partials/keyboard_shortcuts.blade.php
index bc8d51a110e6..4967471cec10 100644
--- a/resources/views/partials/keyboard_shortcuts.blade.php
+++ b/resources/views/partials/keyboard_shortcuts.blade.php
@@ -159,6 +159,10 @@
             location.href = "{{ url('/dashboard') }}";
         });
 
+        Mousetrap.bind('g c', function(e) {
+            location.href = "{{ url('/calendar') }}";
+        });
+
         Mousetrap.bind('g r', function(e) {
             location.href = "{{ url('/reports') }}";
         });
diff --git a/resources/views/reports/chart_builder.blade.php b/resources/views/reports/chart_builder.blade.php
index 1987affd8e50..5ff95c8ab945 100644
--- a/resources/views/reports/chart_builder.blade.php
+++ b/resources/views/reports/chart_builder.blade.php
@@ -274,14 +274,14 @@
 	function setFiltersShown() {
 		var val = $('#report_type').val();
 		if (val == '{{ ENTITY_TAX_RATE }}') {
-			$('#dateField').fadeIn();
+			$('#dateField').show();
 		} else {
-			$('#dateField').fadeOut();
+			$('#dateField').hide();
 		}
 		if (val == '{{ ENTITY_INVOICE }}' || val == '{{ ENTITY_PRODUCT }}') {
-			$('#statusField').fadeIn();
+			$('#statusField').show();
 		} else {
-			$('#statusField').fadeOut();
+			$('#statusField').hide();
 		}
 	}