From 6fbfe6fb723d07395e633caf723c8f68c2e4e059 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 10 Aug 2017 19:55:52 +0200 Subject: [PATCH] Remove references to date range thing. --- app/Http/Controllers/JavascriptController.php | 80 ------------------- resources/views/javascript/variables.twig | 19 ----- 2 files changed, 99 deletions(-) diff --git a/app/Http/Controllers/JavascriptController.php b/app/Http/Controllers/JavascriptController.php index 1ad10422c2..8fe17dcc50 100644 --- a/app/Http/Controllers/JavascriptController.php +++ b/app/Http/Controllers/JavascriptController.php @@ -88,11 +88,6 @@ class JavascriptController extends Controller */ public function variables(Request $request) { - $picker = $this->getDateRangePicker(); - $start = Session::get('start'); - $end = Session::get('end'); - $linkTitle = sprintf('%s - %s', $start->formatLocalized($this->monthAndDayFormat), $end->formatLocalized($this->monthAndDayFormat)); - $firstDate = session('first')->format('Y-m-d'); $localeconv = localeconv(); $accounting = Amount::getJsConfig($localeconv); $localeconv = localeconv(); @@ -101,9 +96,6 @@ class JavascriptController extends Controller $pref = Preferences::get('language', config('firefly.default_language', 'en_US')); $lang = $pref->data; $data = [ - 'picker' => $picker, - 'linkTitle' => $linkTitle, - 'firstDate' => $firstDate, 'currencyCode' => Amount::getCurrencyCode(), 'currencySymbol' => Amount::getCurrencySymbol(), 'accounting' => $accounting, @@ -116,76 +108,4 @@ class JavascriptController extends Controller ->view('javascript.variables', $data, 200) ->header('Content-Type', 'text/javascript'); } - - /** - * @return array - * @throws FireflyException - */ - private function getDateRangePicker(): array - { - $viewRange = Preferences::get('viewRange', '1M')->data; - $start = Session::get('start'); - $end = Session::get('end'); - - $prevStart = clone $start; - $prevEnd = clone $start; - $nextStart = clone $end; - $nextEnd = clone $end; - if ($viewRange === 'custom') { - $days = $start->diffInDays($end); - $prevStart->subDays($days); - $nextEnd->addDays($days); - unset($days); - } - - if ($viewRange !== 'custom') { - $prevStart = Navigation::subtractPeriod($start, $viewRange);// subtract for previous period - $prevEnd = Navigation::endOfPeriod($prevStart, $viewRange); - $nextStart = Navigation::addPeriod($start, $viewRange, 0); // add for previous period - $nextEnd = Navigation::endOfPeriod($nextStart, $viewRange); - } - - $ranges = []; - $ranges['current'] = [$start->format('Y-m-d'), $end->format('Y-m-d')]; - $ranges['previous'] = [$prevStart->format('Y-m-d'), $prevEnd->format('Y-m-d')]; - $ranges['next'] = [$nextStart->format('Y-m-d'), $nextEnd->format('Y-m-d')]; - - switch ($viewRange) { - default: - throw new FireflyException('The date picker does not yet support "' . $viewRange . '".'); // @codeCoverageIgnore - case '1D': - case 'custom': - $format = (string)trans('config.month_and_day'); - break; - case '3M': - $format = (string)trans('config.quarter_in_year'); - break; - case '6M': - $format = (string)trans('config.half_year'); - break; - case '1Y': - $format = (string)trans('config.year'); - break; - case '1M': - $format = (string)trans('config.month'); - break; - case '1W': - $format = (string)trans('config.week_in_year'); - break; - } - - $current = $start->formatLocalized($format); - $next = $nextStart->formatLocalized($format); - $prev = $prevStart->formatLocalized($format); - - return [ - 'start' => $start->format('Y-m-d'), - 'end' => $end->format('Y-m-d'), - 'current' => $current, - 'previous' => $prev, - 'next' => $next, - 'ranges' => $ranges, - ]; - } - } diff --git a/resources/views/javascript/variables.twig b/resources/views/javascript/variables.twig index 115ebcfcca..19371d350d 100644 --- a/resources/views/javascript/variables.twig +++ b/resources/views/javascript/variables.twig @@ -1,22 +1,3 @@ -// date range picker configuration: -var dateRangeConfig = { -startDate: moment("{{ picker.start }}"), -endDate: moment("{{ picker.end }}"), -linkTitle: "{{ linkTitle }}", -URL: "{{ route('daterange') }}", -firstDate: moment("{{ firstDate }}"), -currentPeriod: "{{ picker.current }}", -previousPeriod: "{{ picker.previous }}", -nextPeriod: "{{ picker.next }}", -everything: '{{ 'everything'|_|escape }}', -customRangeLabel: '{{ 'customRange'|_|escape }}', -applyLabel: '{{ 'apply'|_|escape }}', -cancelLabel: '{{ 'cancel'|_|escape }}', -fromLabel: '{{ 'from'|_|escape }}', -toLabel: '{{ 'to'|_|escape }}', -ranges: {{ picker.ranges|json_encode|raw }} -}; - var language = "{{ language|escape }}"; var currencyCode = '{{ currencyCode|escape('js') }}'; var currencySymbol = '{{ currencySymbol|escape('js') }}';