Final set of route changes.

resources/views/reports/default/month.twig

@@ -133,13 +133,13 @@
         var accountIds = '{{ accountIds }}';
 
         // uri's for data
-        var categoryReportUri = '{{ route('report-data.category.operations', [start.format('Ymd'), end.format('Ymd'), accountIds]) }}';
-        var budgetReportUri = '{{ route('report-data.budget.general', [start.format('Ymd'), end.format('Ymd'), accountIds]) }}';
-        var balanceReportUri = '{{ route('report-data.balance.general', [start.format('Ymd'), end.format('Ymd'), accountIds]) }}';
-        var accountReportUri = '{{ route('report-data.account.general', [start.format('Ymd'), end.format('Ymd'), accountIds]) }}';
-        var incomeReportUri = '{{ route('report-data.operations.income', [start.format('Ymd'), end.format('Ymd'), accountIds]) }}';
-        var expenseReportUri = '{{ route('report-data.operations.expenses', [start.format('Ymd'), end.format('Ymd'), accountIds]) }}';
-        var incExpReportUri = '{{ route('report-data.operations.operations', [start.format('Ymd'), end.format('Ymd'), accountIds]) }}';
+        var accountReportUri = '{{ route('report-data.account.general', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
+        var categoryReportUri = '{{ route('report-data.category.operations', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
+        var budgetReportUri = '{{ route('report-data.budget.general', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
+        var balanceReportUri = '{{ route('report-data.balance.general', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
+        var incomeReportUri = '{{ route('report-data.operations.income', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
+        var expenseReportUri = '{{ route('report-data.operations.expenses', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
+        var incExpReportUri = '{{ route('report-data.operations.operations', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
 
         // uri's for charts:
         var accountChartUri = '{{ route('chart.account.report', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';

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

@@ -114,14 +114,27 @@
         </div>
     </div>
 
-    {# same thing but for categories #}
+    {# same thing but for categories (expenses) #}
     <div class="row">
         <div class="col-lg-12 col-md-12 col-sm-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'categories'|_ }}</h3>
+                    <h3 class="box-title">{{ 'categories'|_ }} ({{ 'expenses'|_ }})</h3>
                 </div>
-                <div class="box-body no-padding table-responsive loading" id="categoryPeriodReport">
+                <div class="box-body no-padding table-responsive loading" id="categoryExpense">
+                </div>
+            </div>
+        </div>
+    </div>
+
+    {# same thing but for categories (income) #}
+    <div class="row">
+        <div class="col-lg-12 col-md-12 col-sm-12">
+            <div class="box">
+                <div class="box-header with-border">
+                    <h3 class="box-title">{{ 'categories'|_ }} ({{ 'income'|_ }})</h3>
+                </div>
+                <div class="box-body no-padding table-responsive loading" id="categoryIncome">
                 </div>
             </div>
         </div>
@@ -159,17 +172,22 @@
         // to report another URL:
         var startDate = '{{ start.format('Ymd') }}';
         var endDate = '{{ end.format('Ymd') }}';
-        var reportType = '{{ reportType }}';
         var accountIds = '{{ accountIds }}';
 
-        <!-- some URL's -->
-        var accountReportUri = '{{ route('reports.data.accountReport', [start.format('Ymd'), end.format('Ymd'), accountIds]) }}';
-        var incomeReportUri = '{{ route('reports.data.incomeReport', [start.format('Ymd'), end.format('Ymd'), accountIds]) }}';
-        var expenseReportUri = '{{ route('reports.data.expenseReport', [start.format('Ymd'), end.format('Ymd'), accountIds]) }}';
-        var incExpReportUri = '{{ route('reports.data.incExpReport', [start.format('Ymd'), end.format('Ymd'), accountIds]) }}';
+        // report uri's
+        var opChartUri ='{{ route('chart.report.operations', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
+        var sumChartUri='{{ route('chart.report.sum', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
+        var netWorthUri ='{{ route('chart.report.net-worth', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
 
-        var budgetPeriodReportUri = '{{ route('reports.data.budgetPeriodReport', [start.format('Ymd'), end.format('Ymd'), accountIds]) }}';
-        var categoryPeriodReportUri = '{{ route('reports.data.categoryPeriodReport', [start.format('Ymd'), end.format('Ymd'), accountIds]) }}';
+        // data uri's
+        var accountReportUri = '{{ route('report-data.account.general', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
+        var incomeReportUri = '{{ route('report-data.operations.income', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
+        var expenseReportUri = '{{ route('report-data.operations.expenses', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
+        var incExpReportUri = '{{ route('report-data.operations.operations', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
+
+        var budgetPeriodReportUri = '{{ route('report-data.budget.period', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
+        var categoryExpenseUri = '{{ route('report-data.category.expenses', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
+        var categoryIncomeUri = '{{ route('report-data.category.income', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
 
     </script>
     <script type="text/javascript" src="js/ff/reports/default/all.js"></script>

resources/views/reports/default/year.twig

@@ -167,7 +167,6 @@
         // to report another URL:
         var startDate = '{{ start.format('Ymd') }}';
         var endDate = '{{ end.format('Ymd') }}';
-        var reportType = '{{ reportType }}';
         var accountIds = '{{ accountIds }}';
 
         // report uri's

resources/views/reports/index.twig

@@ -114,17 +114,36 @@
                 </div>
                 <div class="box-body">
 
+                    <h4>{{ ('quick_link_default_report')|_ }}</h4>
+                    <ul>
+                        <li><a href="{{ route('reports.report.default',[accountList, 'currentMonthStart','currentMonthEnd']) }}">{{ 'report_this_month_quick'|_ }}</a></li>
+                        <li><a href="{{ route('reports.report.default',[accountList, 'currentYearStart','currentYearEnd']) }}">{{ 'report_this_year_quick'|_ }}</a></li>
+                        {% if customFiscalYear == 1 %}
+                        <li><a href="{{ route('reports.report.default',[accountList, 'currentFiscalYearStart','currentFiscalYearEnd']) }}">{{ 'report_this_fiscal_year_quick'|_ }}</a></li>
+                        {% endif %}
+                        <li><a href="{{ route('reports.report.default',[accountList, start.format('Ymd'),'currentMonthEnd']) }}">{{ 'report_all_time_quick'|_ }}</a></li>
+                    </ul>
+
+                    <h4>{{ ('quick_link_audit_report')|_ }}</h4>
+                    <ul>
+                        <li><a href="{{ route('reports.report.audit',[accountList, 'currentMonthStart','currentMonthEnd']) }}">{{ 'report_this_month_quick'|_ }}</a></li>
+                        <li><a href="{{ route('reports.report.audit',[accountList, 'currentYearStart','currentYearEnd']) }}">{{ 'report_this_year_quick'|_ }}</a></li>
+                        {% if customFiscalYear == 1 %}
+                            <li><a href="{{ route('reports.report.audit',[accountList, 'currentFiscalYearStart','currentFiscalYearEnd']) }}">{{ 'report_this_fiscal_year_quick'|_ }}</a></li>
+                        {% endif %}
+                        <li><a href="{{ route('reports.report.audit',[accountList, start.format('Ymd'),'currentMonthEnd']) }}">{{ 'report_all_time_quick'|_ }}</a></li>
+                    </ul>
+                    {#<h4>{{ ('quick_link_category_report')|_ }}</h4>#}
+
+
+                    {#
+
                     {% for type in ['default','audit'] %}
-                        <h4>{{ ('quick_link_'~type~'_report')|_ }}</h4>
+
 
                         <ul>
                             <li>
-                                <a href="{{ route('reports.report.'~type,
-                                [
-                                'currentMonthStart',
-                                'currentMonthEnd',
-                                accountList
-                                ]) }}">{{ 'report_this_month_quick'|_ }}</a>
+
                             </li>
                             <li>
                                 <a href="{{ route('reports.report.'~type,
@@ -154,6 +173,8 @@
                             </li>
                         </ul>
                     {% endfor %}
+                    #}
+
                     <p>
                         <em>{{ 'reports_can_bookmark'|_ }}</em>
                     </p>

resources/views/reports/partials/budgets.twig

@@ -26,7 +26,7 @@
 
             {% if budgetLine.getRepetition.id %}
                 <td class="hidden-xs" data-value="{{ budgetLine.getRepetition.startdate.format('Y-m-d') }}">
-                    <a href="{{ route('budgets.showWithRepetition', [budgetLine.getBudget.id, budgetLine.getRepetition.id]) }}">
+                    <a href="{{ route('budgets.show.repetition', [budgetLine.getBudget.id, budgetLine.getRepetition.id]) }}">
                         {{ budgetLine.getRepetition.startdate.formatLocalized(monthAndDayFormat) }}
                         &mdash;
                         {{ budgetLine.getRepetition.enddate.formatLocalized(monthAndDayFormat) }}

resources/views/reports/partials/categories.twig

@@ -6,26 +6,28 @@
     </tr>
     </thead>
     <tbody>
-    {% for cat in categories.getCategories %}
+    {% set sum = 0 %}
+    {% for id, category in report %}
+        {% set sum = sum + category.spent %}
         {% if loop.index > listLength %}
             <tr class="overListLength">
         {% else %}
             <tr>
         {% endif %}
         <td>
-            <a href="{{ route('categories.show',cat.id) }}">{{ cat.name }}</a>
+            <a href="{{ route('categories.show',id) }}">{{ category.name }}</a>
         </td>
-        <td>{{ cat.spent|formatAmount }}</td>
+        <td>{{ category.spent|formatAmount }}</td>
         <td style="width:20px;">
             <i class="fa fa-fw fa-info-circle text-muted firefly-info-button"
-               data-location="category-entry" data-category-id="{{ cat.id }}"
+               data-location="category-entry" data-category-id="{{ id }}"
             ></i>
         </td>
         </tr>
     {% endfor %}
     </tbody>
     <tfoot>
-    {% if categories.getCategories.count > listLength %}
+    {% if report|length > listLength %}
         <tr>
             <td colspan="2" class="active">
                 <a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',{number:incomeTopLength}) }}</a>
@@ -35,7 +37,7 @@
 
     <tr>
         <td><em>{{ 'sum'|_ }}</em></td>
-        <td>{{ categories.getTotal|formatAmount }}</td>
+        <td>{{ sum|formatAmount }}</td>
     </tr>
     </tfoot>
 </table>