IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Clean up some JS and views.

Browse Source
This commit is contained in:
James Cole 2018-01-01 16:46:41 +01:00
parent 06cfc391a1
commit d87dda40ee
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
5 changed files with 13 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
public/js/ff/reports/default/month.js
View File

@ -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');
}

12
public/js/ff/reports/default/multi-year.js
View File

@ -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');
}

13
public/js/ff/reports/default/year.js
View File

@ -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');
}

7
resources/views/reports/default/multi-year.twig
View File

@ -9,7 +9,7 @@
{# charts #}
<div class="row">
<div class="col-lg-8 col-md-8 col-sm-12">
<div class="box">
<div class="box" id="year-inc-exp">
<div class="box-header with-border">
<h3 class="box-title">{{ 'incomeVsExpenses'|_ }}</h3>
</div>
@ -19,7 +19,7 @@
</div>
</div>
<div class="col-lg-4 col-md-4 col-sm-12">
<div class="box">
<div class="box" id="year-inc-exp-sum">
<div class="box-header with-border">
<h3 class="box-title">{{ 'incomeVsExpenses'|_ }}</h3>
</div>
@ -59,8 +59,9 @@
</div>
</div>
</div>
{# block with income #}
<div class="row">
{# block with income #}
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="box">
<div class="box-header with-border">

3
resources/views/reports/default/year.twig
View File

@ -24,11 +24,12 @@
<h3 class="box-title">{{ 'incomeVsExpenses'|_ }}</h3>
</div>
<div class="box-body">
<canvas height="400" id="income-expenses-sum-chart" style="width:100%;height:400px;"></canvas>
<canvas id="income-expenses-sum-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
</div>
</div>
</div>
</div>
{# balances and inc vs exp #}
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">