mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-02-25 18:45:27 -06:00
Remove optional chart (always enabled)
This commit is contained in:
James Cole
parent
eabfe0769b
commit
ad18b9b81b
@ -165,7 +165,6 @@ class HomeController extends Controller
|
||||
/** @var Carbon $end */
|
||||
$end = session('end', Carbon::now()->endOfMonth());
|
||||
$accounts = $repository->getAccountsById($frontPage->data);
|
||||
$showDeps = Preferences::get('showDepositsFrontpage', false)->data;
|
||||
$today = new Carbon;
|
||||
|
||||
// zero bills? Hide some elements from view.
|
||||
@ -185,7 +184,7 @@ class HomeController extends Controller
|
||||
|
||||
return view(
|
||||
'index',
|
||||
compact('count', 'subTitle', 'transactions', 'showDeps', 'billCount', 'start', 'end', 'today')
|
||||
compact('count', 'subTitle', 'transactions', 'billCount', 'start', 'end', 'today')
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@ -5,183 +5,181 @@
|
||||
{% endblock %}
|
||||
{% block content %}
|
||||
{% include 'partials.boxes' %}
|
||||
<div class="row">
|
||||
<div class="col-lg-8 col-md-12 col-sm-12">
|
||||
{# ACCOUNTS #}
|
||||
<div class="box box-primary">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title"><a href="{{ route('accounts.index',['asset']) }}" title="{{ 'yourAccounts'|_ }}">{{ 'yourAccounts'|_ }}</a></h3>
|
||||
</div>
|
||||
<div class="box-body">
|
||||
<canvas id="accounts-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
|
||||
</div>
|
||||
<div class="box-footer">
|
||||
<a href="{{ route('accounts.index','asset') }}" class="btn btn-default button-sm"><i
|
||||
class="fa fa-money"></i> {{ 'go_to_asset_accounts'|_ }}</a>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-lg-8 col-md-12 col-sm-12">
|
||||
{# ACCOUNTS #}
|
||||
<div class="box box-primary">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title"><a href="{{ route('accounts.index',['asset']) }}" title="{{ 'yourAccounts'|_ }}">{{ 'yourAccounts'|_ }}</a></h3>
|
||||
</div>
|
||||
|
||||
{# BUDGETS #}
|
||||
<div class="box">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title"><a href="{{ route('budgets.index') }}" title="{{ 'budgetsAndSpending'|_ }}">{{ 'budgetsAndSpending'|_ }}</a></h3>
|
||||
</div>
|
||||
<div class="box-body">
|
||||
<canvas id="budgets-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
|
||||
</div>
|
||||
<div class="box-footer">
|
||||
<a href="{{ route('budgets.index') }}" class="btn btn-default button-sm"><i
|
||||
class="fa fa-tasks"></i> {{ 'go_to_budgets'|_ }}</a>
|
||||
</div>
|
||||
<div class="box-body">
|
||||
<canvas id="accounts-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
|
||||
</div>
|
||||
{# CATEGORIES #}
|
||||
<div class="box">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title"><a href="{{ route('categories.index') }}" title="{{ 'categories'|_ }}">{{ 'categories'|_ }}</a></h3>
|
||||
|
||||
</div>
|
||||
<div class="box-body">
|
||||
<canvas id="categories-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
|
||||
</div>
|
||||
<div class="box-footer">
|
||||
<a href="{{ route('categories.index') }}" class="btn btn-default button-sm"><i
|
||||
class="fa fa-bar-chart"></i> {{ 'go_to_categories'|_ }}</a>
|
||||
</div>
|
||||
<div class="box-footer">
|
||||
<a href="{{ route('accounts.index','asset') }}" class="btn btn-default button-sm"><i
|
||||
class="fa fa-money"></i> {{ 'go_to_asset_accounts'|_ }}</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-lg-4 col-md-6 col-sm-12">
|
||||
{# TRANSACTIONS #}
|
||||
<div id="all_transactions">
|
||||
{% for data in transactions %}
|
||||
<div class="box">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title"><a href="{{ route('accounts.show', data[1].id) }}">{{ data[1].name }}</a></h3>
|
||||
|
||||
<div class="box-tools pull-right">
|
||||
<div class="btn-group">
|
||||
<button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i></button>
|
||||
<ul class="dropdown-menu" role="menu">
|
||||
<li><a href="{{ route('transactions.create','withdrawal') }}?source={{ data[1].id }}"><i
|
||||
class="fa fa-long-arrow-left fa-fw"></i> {{ 'newWithdrawal'|_ }}</a></li>
|
||||
<li><a href="{{ route('transactions.create','deposit') }}?source={{ data[1].id }}"><i
|
||||
class="fa fa-long-arrow-right fa-fw"></i> {{ 'newDeposit'|_ }}</a></li>
|
||||
<li><a href="{{ route('transactions.create','transfer') }}?source={{ data[1].id }}"><i
|
||||
class="fa fa-fw fa-exchange"></i> {{ 'newTransfer'|_ }}</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
{# BUDGETS #}
|
||||
<div class="box">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title"><a href="{{ route('budgets.index') }}" title="{{ 'budgetsAndSpending'|_ }}">{{ 'budgetsAndSpending'|_ }}</a></h3>
|
||||
</div>
|
||||
<div class="box-body">
|
||||
<canvas id="budgets-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
|
||||
</div>
|
||||
<div class="box-footer">
|
||||
<a href="{{ route('budgets.index') }}" class="btn btn-default button-sm"><i
|
||||
class="fa fa-tasks"></i> {{ 'go_to_budgets'|_ }}</a>
|
||||
</div>
|
||||
</div>
|
||||
{# CATEGORIES #}
|
||||
<div class="box">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title"><a href="{{ route('categories.index') }}" title="{{ 'categories'|_ }}">{{ 'categories'|_ }}</a></h3>
|
||||
|
||||
</div>
|
||||
<div class="box-body">
|
||||
<canvas id="categories-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
|
||||
</div>
|
||||
<div class="box-footer">
|
||||
<a href="{{ route('categories.index') }}" class="btn btn-default button-sm"><i
|
||||
class="fa fa-bar-chart"></i> {{ 'go_to_categories'|_ }}</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-lg-4 col-md-6 col-sm-12">
|
||||
{# TRANSACTIONS #}
|
||||
<div id="all_transactions">
|
||||
{% for data in transactions %}
|
||||
<div class="box">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title"><a href="{{ route('accounts.show', data[1].id) }}">{{ data[1].name }}</a></h3>
|
||||
|
||||
<div class="box-tools pull-right">
|
||||
<div class="btn-group">
|
||||
<button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i></button>
|
||||
<ul class="dropdown-menu" role="menu">
|
||||
<li><a href="{{ route('transactions.create','withdrawal') }}?source={{ data[1].id }}"><i
|
||||
class="fa fa-long-arrow-left fa-fw"></i> {{ 'newWithdrawal'|_ }}</a></li>
|
||||
<li><a href="{{ route('transactions.create','deposit') }}?source={{ data[1].id }}"><i
|
||||
class="fa fa-long-arrow-right fa-fw"></i> {{ 'newDeposit'|_ }}</a></li>
|
||||
<li><a href="{{ route('transactions.create','transfer') }}?source={{ data[1].id }}"><i
|
||||
class="fa fa-fw fa-exchange"></i> {{ 'newTransfer'|_ }}</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% if data[0].count > 0 %}
|
||||
<div class="box-body no-padding">
|
||||
{% include 'list.journals-tiny' with {'transactions': data[0],'account': data[1]} %}
|
||||
</div>
|
||||
{% else %}
|
||||
<div class="box-body">
|
||||
<p>
|
||||
<em>
|
||||
{{ trans('firefly.no_transactions_account', {name: data[1].name}) }}
|
||||
</em>
|
||||
</p>
|
||||
{% if data[0].count > 0 %}
|
||||
<div class="box-body no-padding">
|
||||
{% include 'list.journals-tiny' with {'transactions': data[0],'account': data[1]} %}
|
||||
</div>
|
||||
{% else %}
|
||||
<div class="box-body">
|
||||
<p>
|
||||
<em>
|
||||
{{ trans('firefly.no_transactions_account', {name: data[1].name}) }}
|
||||
</em>
|
||||
</p>
|
||||
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<div class="box-footer clearfix">
|
||||
<div class="btn-group" role="group">
|
||||
|
||||
</div>
|
||||
|
||||
<div class="btn-group" role="group" aria-label="...">
|
||||
|
||||
<div class="box-footer clearfix">
|
||||
<div class="btn-group" role="group">
|
||||
|
||||
<a href="{{ route('transactions.create','withdrawal') }}?source={{ data[1].id }}" class="btn btn-success"><i
|
||||
class="fa fa-plus fa-fw"></i> {{ 'create_new_transaction'|_ }}</a>
|
||||
<button type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown" aria-haspopup="true"
|
||||
aria-expanded="false">
|
||||
<span class="caret"></span>
|
||||
<span class="sr-only">Toggle Dropdown</span>
|
||||
</button>
|
||||
<ul class="dropdown-menu">
|
||||
<li><a href="{{ route('transactions.create','withdrawal') }}?source={{ data[1].id }}"><i
|
||||
class="fa fa-long-arrow-left fa-fw"></i> {{ 'newWithdrawal'|_ }}</a></li>
|
||||
<li><a href="{{ route('transactions.create','deposit') }}?source={{ data[1].id }}"><i
|
||||
class="fa fa-long-arrow-right fa-fw"></i> {{ 'newDeposit'|_ }}</a></li>
|
||||
<li><a href="{{ route('transactions.create','transfer') }}?source={{ data[1].id }}"><i
|
||||
class="fa fa-fw fa-exchange"></i> {{ 'newTransfer'|_ }}
|
||||
</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="btn-group" role="group" aria-label="...">
|
||||
|
||||
<div class="btn-group" role="group">
|
||||
<a href="{{ route('transactions.create','withdrawal') }}?source={{ data[1].id }}" class="btn btn-success"><i
|
||||
class="fa fa-plus fa-fw"></i> {{ 'create_new_transaction'|_ }}</a>
|
||||
<button type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown" aria-haspopup="true"
|
||||
aria-expanded="false">
|
||||
<span class="caret"></span>
|
||||
<span class="sr-only">Toggle Dropdown</span>
|
||||
</button>
|
||||
<ul class="dropdown-menu">
|
||||
<li><a href="{{ route('transactions.create','withdrawal') }}?source={{ data[1].id }}"><i
|
||||
class="fa fa-long-arrow-left fa-fw"></i> {{ 'newWithdrawal'|_ }}</a></li>
|
||||
<li><a href="{{ route('transactions.create','deposit') }}?source={{ data[1].id }}"><i
|
||||
class="fa fa-long-arrow-right fa-fw"></i> {{ 'newDeposit'|_ }}</a></li>
|
||||
<li><a href="{{ route('transactions.create','transfer') }}?source={{ data[1].id }}"><i
|
||||
class="fa fa-fw fa-exchange"></i> {{ 'newTransfer'|_ }}
|
||||
</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
<a class="btn btn-default"
|
||||
href="{{ route('accounts.show',data[1].id) }}">{{ formatAmountByAccount(data[1], data[1]|balance, false) }}</a>
|
||||
</div>
|
||||
|
||||
<a class="btn btn-default"
|
||||
href="{{ route('accounts.show',data[1].id) }}">{{ formatAmountByAccount(data[1], data[1]|balance, false) }}</a>
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
|
||||
{% if billCount > 0 %}
|
||||
{# BILLS #}
|
||||
<div class="box">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title"><a href="{{ route('bills.index') }}" title="{{ 'bills'|_ }}">{{ 'bills'|_ }}</a></h3>
|
||||
|
||||
</div>
|
||||
<div class="box-body">
|
||||
<div style="width:100%;margin:0 auto;">
|
||||
<canvas id="bills-chart" style="width:100%;height:200px;" height="200"></canvas>
|
||||
</div>
|
||||
</div>
|
||||
<div class="box-footer">
|
||||
<a href="{{ route('bills.index') }}" class="btn btn-default button-sm"><i
|
||||
class="fa fa-calendar"></i> {{ 'go_to_bills'|_ }}</a>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{# box for piggy bank data (JSON) #}
|
||||
<div id="piggy_bank_overview">
|
||||
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-lg-12 col-md-12 col-sm-12">
|
||||
{# EXPENSE ACCOUNTS #}
|
||||
|
||||
{% if billCount > 0 %}
|
||||
{# BILLS #}
|
||||
<div class="box">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title"><a href="{{ route('accounts.index',['expense']) }}"
|
||||
title="{{ 'expense_accounts'|_ }}">{{ 'expense_accounts'|_ }}</a>
|
||||
</h3>
|
||||
<h3 class="box-title"><a href="{{ route('bills.index') }}" title="{{ 'bills'|_ }}">{{ 'bills'|_ }}</a></h3>
|
||||
|
||||
</div>
|
||||
<div class="box-body">
|
||||
<canvas id="expense-accounts-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
|
||||
<div style="width:100%;margin:0 auto;">
|
||||
<canvas id="bills-chart" style="width:100%;height:200px;" height="200"></canvas>
|
||||
</div>
|
||||
</div>
|
||||
<div class="box-footer">
|
||||
<a href="{{ route('accounts.index', ['expense']) }}" class="btn btn-default button-sm"><i
|
||||
class="fa fa-shopping-cart"></i> {{ 'go_to_expense_accounts'|_ }}</a>
|
||||
<a href="{{ route('bills.index') }}" class="btn btn-default button-sm"><i
|
||||
class="fa fa-calendar"></i> {{ 'go_to_bills'|_ }}</a>
|
||||
</div>
|
||||
</div>
|
||||
{# OPTIONAL REVENUE ACCOUNTS #}
|
||||
{% if showDeps %}
|
||||
<div class="box">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title"><a href="{{ route('accounts.index',['revenue']) }}"
|
||||
title="{{ 'revenue_accounts'|_ }}">{{ 'revenue_accounts'|_ }}</a></h3>
|
||||
{% endif %}
|
||||
|
||||
{# box for piggy bank data (JSON) #}
|
||||
<div id="piggy_bank_overview">
|
||||
|
||||
</div>
|
||||
<div class="box-body">
|
||||
<canvas id="revenue-accounts-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
|
||||
</div>
|
||||
<div class="box-footer">
|
||||
<a href="{{ route('accounts.index', ['revenue']) }}" class="btn btn-default button-sm"><i
|
||||
class="fa fa-download"></i> {{ 'go_to_revenue_accounts'|_ }}</a>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-lg-12 col-md-12 col-sm-12">
|
||||
{# EXPENSE ACCOUNTS #}
|
||||
<div class="box">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title"><a href="{{ route('accounts.index',['expense']) }}"
|
||||
title="{{ 'expense_accounts'|_ }}">{{ 'expense_accounts'|_ }}</a>
|
||||
</h3>
|
||||
</div>
|
||||
<div class="box-body">
|
||||
<canvas id="expense-accounts-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
|
||||
</div>
|
||||
<div class="box-footer">
|
||||
<a href="{{ route('accounts.index', ['expense']) }}" class="btn btn-default button-sm"><i
|
||||
class="fa fa-shopping-cart"></i> {{ 'go_to_expense_accounts'|_ }}</a>
|
||||
</div>
|
||||
</div>
|
||||
{# OPTIONAL REVENUE ACCOUNTS #}
|
||||
<div class="box">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title"><a href="{{ route('accounts.index',['revenue']) }}"
|
||||
title="{{ 'revenue_accounts'|_ }}">{{ 'revenue_accounts'|_ }}</a></h3>
|
||||
|
||||
</div>
|
||||
<div class="box-body">
|
||||
<canvas id="revenue-accounts-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
|
||||
</div>
|
||||
<div class="box-footer">
|
||||
<a href="{{ route('accounts.index', ['revenue']) }}" class="btn btn-default button-sm"><i
|
||||
class="fa fa-download"></i> {{ 'go_to_revenue_accounts'|_ }}</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
{% block scripts %}
|
||||
<script type="text/javascript">
|
||||
|
||||
Loading…
Reference in New Issue
Block a user