diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php index f6170e2057fd..d73d1a16b0bd 100644 --- a/resources/views/dashboard.blade.php +++ b/resources/views/dashboard.blade.php @@ -95,13 +95,15 @@ // Initialize date range selector chartStartDate = moment().subtract(29, 'days'); chartEndDate = moment(); + lastRange = false; if (isStorageSupported()) { - var lastRange = localStorage.getItem('last:dashboard_range'); - lastRange = dateRanges[lastRange]; - if (lastRange) { - chartStartDate = lastRange[0]; - chartEndDate = lastRange[1]; + lastRange = localStorage.getItem('last:dashboard_range'); + dateRange = dateRanges[lastRange]; + + if (dateRange) { + chartStartDate = dateRange[0]; + chartEndDate = dateRange[1]; } @if (count($currencies) > 1) @@ -123,7 +125,10 @@ $('#reportrange span').html(start.format('{{ $account->getMomentDateFormat() }}') + ' - ' + end.format('{{ $account->getMomentDateFormat() }}')); chartStartDate = start; chartEndDate = end; - $('.range-label-div').text(label); + $('.range-label-div').show(); + if (label) { + $('.range-label-div').text(label); + } loadData(); if (isStorageSupported() && label && label != "{{ trans('texts.custom_range') }}") { @@ -142,7 +147,7 @@ ranges: dateRanges, }, cb); - cb(chartStartDate, chartEndDate); + cb(chartStartDate, chartEndDate, lastRange); $("#currency-btn-group > .btn").click(function(){ $(this).addClass("active").siblings().removeClass("active"); @@ -272,7 +277,7 @@   -
+
@@ -322,7 +327,7 @@ @endif -
+
@@ -354,7 +359,7 @@   -
+