kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-12 01:42:32 +00:00
Code Issues Projects Releases Wiki Activity

Better category overview [skip ci]

Browse Source
This commit is contained in:
James Cole
2016-12-27 11:02:14 +01:00
parent 5efdf53c06
commit 244972e0f8
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/CategoryController.php
View File

@@ -222,6 +222,7 @@ class CategoryController extends Controller
$hideCategory = true; // used in list. $hideCategory = true; // used in list.
$page = intval(Input::get('page')) === 0 ? 1 : intval(Input::get('page')); $page = intval(Input::get('page')) === 0 ? 1 : intval(Input::get('page'));
$pageSize = intval(Preferences::get('transactionPageSize', 50)->data); $pageSize = intval(Preferences::get('transactionPageSize', 50)->data);
$showAll = true;
// new collector: // new collector:
$collector = app(JournalCollectorInterface::class); $collector = app(JournalCollectorInterface::class);
@@ -229,7 +230,7 @@ class CategoryController extends Controller
$journals = $collector->getPaginatedJournals(); $journals = $collector->getPaginatedJournals();
$journals->setPath('categories/show/' . $category->id . '/all'); $journals->setPath('categories/show/' . $category->id . '/all');
return view('categories.show', compact('category', 'journals', 'hideCategory', 'subTitle', 'subTitleIcon', 'start', 'end')); return view('categories.show', compact('category', 'journals', 'hideCategory', 'subTitle', 'subTitleIcon', 'start', 'end', 'showAll'));
} }
/** /**

16
resources/views/categories/show.twig
View File

@@ -28,7 +28,8 @@
</div> </div>
</div> </div>
</div> </div>
{% else %} {% endif %}
{% if not entries and not showAll %}
{# single chart #} {# single chart #}
<div class="col-lg-12 col-md-12 col-sm-12"> <div class="col-lg-12 col-md-12 col-sm-12">
<div class="box"> <div class="box">
@@ -41,6 +42,19 @@
</div> </div>
</div> </div>
{% endif %} {% endif %}
{% if not entries and showAll %}
{# all chart #}
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'overview'|_ }} ({{ 'all_periods'|_|lower }})</h3>
</div>
<div class="box-body">
<canvas id="all" style="width:100%;" height="350"></canvas>
</div>
</div>
</div>
{% endif %}
</div> </div>
<div class="row"> <div class="row">
<div class="{% if entries %}col-lg-10 col-md-8 col-sm-12 col-xs-12{% else %}col-lg-12 col-md-12 col-sm-12 col-xs-12{% endif %}"> <div class="{% if entries %}col-lg-10 col-md-8 col-sm-12 col-xs-12{% else %}col-lg-12 col-md-12 col-sm-12 col-xs-12{% endif %}">