Fix bread crumbs, clean up routes.

app/Http/Controllers/ReportController.php

@@ -70,14 +70,6 @@ class ReportController extends Controller
      */
     public function defaultYear($report_type, Carbon $start, Carbon $end, Collection $accounts)
     {
-        $subTitle         = trans(
-            'firefly.report_default_year',
-            [
-                'start' => $start->formatLocalized($this->monthFormat),
-                'end'   => $end->formatLocalized($this->monthFormat)
-            ]
-        );
-        $subTitleIcon     = 'fa-bar-chart';
         $incomeTopLength  = 8;
         $expenseTopLength = 8;
 
@@ -101,7 +93,7 @@ class ReportController extends Controller
             'reports.default.year',
             compact(
                 'start', 'accountReport', 'incomes', 'report_type', 'accountIds', 'end',
-                'expenses', 'subTitle', 'subTitleIcon', 'incomeTopLength', 'expenseTopLength'
+                'expenses', 'incomeTopLength', 'expenseTopLength'
             )
         );
     }
@@ -117,15 +109,6 @@ class ReportController extends Controller
      */
     public function defaultMonth($report_type, Carbon $start, Carbon $end, Collection $accounts)
     {
-        // some fields for translation:
-        $subTitle         = trans(
-            'firefly.report_default_month',
-            [
-                'start' => $start->formatLocalized($this->monthAndDayFormat),
-                'end'   => $end->formatLocalized($this->monthAndDayFormat)
-            ]
-        );
-        $subTitleIcon     = 'fa-calendar';
         $incomeTopLength  = 8;
         $expenseTopLength = 8;
 
@@ -151,7 +134,6 @@ class ReportController extends Controller
             'reports.default.month',
             compact(
                 'start', 'end', 'report_type',
-                'subTitle', 'subTitleIcon',
                 'accountReport',
                 'incomes', 'incomeTopLength',
                 'expenses', 'expenseTopLength',
@@ -165,14 +147,7 @@ class ReportController extends Controller
 
     public function defaultMultiYear($report_type, $start, $end, $accounts)
     {
-        $subTitle     = trans(
+
-            'firefly.report_default_multi-year',
-            [
-                'start' => $start->formatLocalized($this->monthFormat),
-                'end'   => $end->formatLocalized($this->monthFormat)
-            ]
-        );
-        $subTitleIcon = 'fa-calendar';
 
         // list of users stuff:
         $budgets    = app('FireflyIII\Repositories\Budget\BudgetRepositoryInterface')->getActiveBudgets();
@@ -187,7 +162,7 @@ class ReportController extends Controller
         $accountIds = join(';', $accountIds);
 
         return view(
-            'reports.default.multi-year', compact('budgets', 'accounts', 'categories', 'start', 'end', 'accountIds', 'report_type', 'subTitle', 'subTitleIcon')
+            'reports.default.multi-year', compact('budgets', 'accounts', 'categories', 'start', 'end', 'accountIds', 'report_type')
         );
     }
 
@@ -209,6 +184,18 @@ class ReportController extends Controller
         switch ($report_type) {
             default:
             case 'default':
+
+                View::share(
+                    'subTitle', trans(
+                    'firefly.report_default',
+                    [
+                        'start' => $start->formatLocalized($this->monthFormat),
+                        'end'   => $end->formatLocalized($this->monthFormat)
+                    ]
+                )
+                );
+                View::share('subTitleIcon', 'fa-calendar');
+
                 // 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.');

app/Http/breadcrumbs.php

@@ -351,30 +351,14 @@ Breadcrumbs::register(
 );
 
 Breadcrumbs::register(
-    'reports.year', function (Generator $breadcrumbs, Carbon $date, $shared) {
+    'reports.report', function (Generator $breadcrumbs, Carbon $start, Carbon $end, $reportType, $accountIds) {
     $breadcrumbs->parent('reports.index');
-    if ($shared) {
-        $title = trans('breadcrumbs.yearly_report_shared', ['date' => $date->year]);
-    } else {
-        $title = trans('breadcrumbs.yearly_report', ['date' => $date->year]);
-    }
-    $breadcrumbs->push($title, route('reports.year', [$date->year]));
-}
-);
 
-Breadcrumbs::register(
+    $pref        = Preferences::get('language', 'en')->data;
-    'reports.month', function (Generator $breadcrumbs, Carbon $date, $shared) {
+    $monthFormat = Config::get('firefly.monthAndDay.' . $pref);
-    $breadcrumbs->parent('reports.year', $date, $shared);
+    $title       = trans('firefly.report_default', ['start' => $start->formatLocalized($monthFormat), 'end' => $end->formatLocalized($monthFormat)]);
-    $language = Preferences::get('language', 'en')->data;
-    $format   = Config::get('firefly.month.' . $language);
 
-    if ($shared) {
+    $breadcrumbs->push($title, route('reports.report', ['url' => 'abcde']));
-        $title = trans('breadcrumbs.monthly_report_shared', ['date' => $date->formatLocalized($format)]);
-    } else {
-        $title = trans('breadcrumbs.monthly_report', ['date' => $date->formatLocalized($format)]);
-    }
-
-    $breadcrumbs->push($title, route('reports.month', [$date->year, $date->month]));
 }
 );
 

app/Http/routes.php

@@ -448,12 +448,10 @@ Route::group(
      * Report Controller
      */
     Route::get('/reports', ['uses' => 'ReportController@index', 'as' => 'reports.index']);
-    Route::post('/reports/select', ['uses' => 'ReportController@select', 'as' => 'reports.select']);
+//    Route::post('/reports/select', ['uses' => 'ReportController@select', 'as' => 'reports.select']);
     Route::get('/reports/report/{report_type}/{start_date}/{end_date}/{accountList}', ['uses' => 'ReportController@report', 'as' => 'reports.report']);
-    Route::get('/reports/{year}/{shared?}', ['uses' => 'ReportController@year', 'as' => 'reports.year'])->where(['year' => '[0-9]{4}', 'shared' => 'shared']);
+//    Route::get('/reports/{year}/{shared?}', ['uses' => 'ReportController@year', 'as' => 'reports.year'])->where(['year' => '[0-9]{4}', 'shared' => 'shared']);
-    Route::get('/reports/{year}/{month}/{shared?}', ['uses' => 'ReportController@month', 'as' => 'reports.month'])->where(
+//    Route::get('/reports/{year}/{month}/{shared?}', ['uses' => 'ReportController@month', 'as' => 'reports.month'])->where(['year' => '[0-9]{4}', 'month' => '[0-9]{1,2}', 'shared' => 'shared']);
-        ['year' => '[0-9]{4}', 'month' => '[0-9]{1,2}', 'shared' => 'shared']
-    );
 
     // pop ups for budget report:
 

resources/lang/en/firefly.php

@@ -374,9 +374,7 @@ return [
     //    'reportForMonth'                   => 'Montly report for :month',
     //    'reportForMonthShared'             => 'Montly report for :month (including shared accounts)',
 
-    'report_default_month'      => 'Default financial report for :start until :end',
+    'report_default'      => 'Default financial report for :start until :end',
-    'report_default_year'       => 'Default financial report for :start until :end',
-    'report_default_multi-year' => 'Default financial report for :start until :end',
 
     'incomeVsExpenses'              => 'Income vs. expenses',
     'accountBalances'               => 'Account balances',

resources/lang/nl/firefly.php

@@ -395,9 +395,7 @@ return [
     //    'reportForMonth'                => 'Maandoverzicht voor :month',
     //    'reportForMonthShared'          => 'Maandoverzicht voor :month (inclusief gedeelde rekeningen)',
 
-    'report_default_month'      => 'Standard financieel rapport (:start tot :end)',
+    'report_default'      => 'Standard financieel rapport (:start tot :end)',
-    'report_default_year'       => 'Standard financieel rapport (:start tot :end)',
-    'report_default_multi-year' => 'Standard financieel rapport (:start tot :end)',
 
     'incomeVsExpenses'              => 'Inkomsten tegenover uitgaven',
     'accountBalances'               => 'Rekeningsaldi',

resources/twig/reports/default/month.twig

@@ -1,7 +1,7 @@
 {% extends "./layout/default.twig" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, start, shared) }}
+    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, start, end, report_type, accountIds) }}
 {% endblock %}
 
 {% block content %}

resources/twig/reports/default/multi-year.twig

@@ -1,7 +1,7 @@
 {% extends "./layout/default.twig" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, start, end) }}
+    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, start, end, report_type, accountIds) }}
 {% endblock %}
 
 {% block content %}

resources/twig/reports/default/year.twig

@@ -1,7 +1,7 @@
 {% extends "./layout/default.twig" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, start, shared) }}
+    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, start, end, report_type, accountIds) }}
 {% endblock %}
 
 {% block content %}