diff --git a/public/js/ff/reports/default/month.js b/public/js/ff/reports/default/month.js index 9f8e67d060..df694d6a1f 100644 --- a/public/js/ff/reports/default/month.js +++ b/public/js/ff/reports/default/month.js @@ -22,17 +22,10 @@ $(function () { "use strict"; - drawChart(); + lineChart(accountChartUri, 'account-balances-chart'); loadAjaxPartial('categoryReport', categoryReportUri); loadAjaxPartial('budgetReport', budgetReportUri); loadAjaxPartial('balanceReport', balanceReportUri); }); -function drawChart() { - "use strict"; - - // month view: - // draw account chart - lineChart(accountChartUri, 'account-balances-chart'); -} \ No newline at end of file diff --git a/public/js/ff/reports/default/multi-year.js b/public/js/ff/reports/default/multi-year.js index 30ae613b0b..f2a56fd888 100644 --- a/public/js/ff/reports/default/multi-year.js +++ b/public/js/ff/reports/default/multi-year.js @@ -22,18 +22,12 @@ $(function () { "use strict"; - drawChart(); + lineChart(netWorthUri, 'net-worth'); + columnChart(opChartUri, 'income-expenses-chart'); + columnChart(sumChartUri, 'income-expenses-sum-chart'); loadAjaxPartial('budgetPeriodReport', budgetPeriodReportUri); loadAjaxPartial('categoryExpense', categoryExpenseUri); loadAjaxPartial('categoryIncome', categoryIncomeUri); }); -function drawChart() { - "use strict"; - - // income and expense over multi year: - lineChart(netWorthUri, 'net-worth'); - columnChart(opChartUri, 'income-expenses-chart'); - columnChart(sumChartUri, 'income-expenses-sum-chart'); -} diff --git a/public/js/ff/reports/default/year.js b/public/js/ff/reports/default/year.js index 621ee4a0fe..79887f7397 100644 --- a/public/js/ff/reports/default/year.js +++ b/public/js/ff/reports/default/year.js @@ -22,19 +22,12 @@ $(function () { "use strict"; - drawChart(); + lineChart(netWorthUri, 'net-worth'); + columnChart(opChartUri, 'income-expenses-chart'); + columnChart(sumChartUri, 'income-expenses-sum-chart'); loadAjaxPartial('budgetPeriodReport', budgetPeriodReportUri); loadAjaxPartial('categoryExpense', categoryExpenseUri); loadAjaxPartial('categoryIncome', categoryIncomeUri); }); -function drawChart() { - "use strict"; - - lineChart(netWorthUri, 'net-worth'); - columnChart(opChartUri, 'income-expenses-chart'); - columnChart(sumChartUri, 'income-expenses-sum-chart'); - - -} diff --git a/resources/views/reports/default/multi-year.twig b/resources/views/reports/default/multi-year.twig index 26b116700b..5cf206ed6e 100644 --- a/resources/views/reports/default/multi-year.twig +++ b/resources/views/reports/default/multi-year.twig @@ -9,7 +9,7 @@ {# charts #}
-
+

{{ 'incomeVsExpenses'|_ }}

@@ -19,7 +19,7 @@
-
+

{{ 'incomeVsExpenses'|_ }}

@@ -59,8 +59,9 @@
+ + {# block with income #}
- {# block with income #}
diff --git a/resources/views/reports/default/year.twig b/resources/views/reports/default/year.twig index c7fbf97539..fa702a12e4 100644 --- a/resources/views/reports/default/year.twig +++ b/resources/views/reports/default/year.twig @@ -24,11 +24,12 @@

{{ 'incomeVsExpenses'|_ }}

- +
+ {# balances and inc vs exp #}