From d7746b3649126bfdd4408f440eec020e786dd3dd Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 13 Dec 2015 10:18:25 +0100 Subject: [PATCH] Support multi-year, not implemented yet. --- app/Http/Controllers/ReportController.php | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index bb91eda66b..348b79446f 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -166,12 +166,22 @@ class ReportController extends Controller return view('error')->with('message', 'End date cannot be before start date, silly!'); } - // more than two months date difference means year report. - if ($start->diffInMonths($end) > 1) { - return $this->defaultYear($report_type, $start, $end, $accounts); - } + switch ($report_type) { + default: + case 'default': + // more than one year date difference means year report. + if ($start->diffInMonths($end) > 12) { + return view('error')->with('message', 'No report yet for this time period.'); +// return $this->defaultMultiYear($report_type, $start, $end, $accounts); + } + // more than two months date difference means year report. + if ($start->diffInMonths($end) > 1) { + return $this->defaultYear($report_type, $start, $end, $accounts); + } - return $this->defaultMonth($report_type, $start, $end, $accounts); + return $this->defaultMonth($report_type, $start, $end, $accounts); + break; + } }