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

Fixed the account view, changed routes.

Browse Source
This commit is contained in:
James Cole
2016-12-10 17:54:35 +01:00
parent a297131440
commit bf99d5c299
3 changed files with 42 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/AccountController.php
View File

@@ -273,7 +273,7 @@ class AccountController extends Controller
$start = $repository->oldestJournalDate($account); $start = $repository->oldestJournalDate($account);
$end = $repository->newestJournalDate($account); $end = $repository->newestJournalDate($account);
return view('accounts.show_with_date', compact('account', 'journals', 'subTitle', 'start', 'end')); return view('accounts.show-by-date', compact('account', 'journals', 'subTitle', 'start', 'end'));
} }
/** /**

77
resources/views/reports/category/month.twig
View File

@@ -155,45 +155,48 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-6"> {% if averageExpenses|length > 0 %}
<div class="box"> <div class="col-lg-6">
<div class="box-header with-border"> <div class="box">
<h3 class="box-title">{{ 'average_spending_per_account'|_ }}</h3> <div class="box-header with-border">
</div> <h3 class="box-title">{{ 'average_spending_per_account'|_ }}</h3>
<div class="box-body table-responsive no-padding"> </div>
<table class="table table-hover sortable"> <div class="box-body table-responsive no-padding">
<thead> <table class="table table-hover sortable">
<tr> <thead>
<th data-defaultsign="az">{{ 'account'|_ }}</th>
<th data-defaultsign="_19">{{ 'spent_average'|_ }}</th>
<th data-defaultsign="_19">{{ 'total'|_ }}</th>
<th data-defaultsign="_19">{{ 'transaction_count'|_ }}</th>
</tr>
</thead>
<tbody>
{% for row in averageExpenses %}
<tr> <tr>
<td data-value="{{ row.name }}"> <th data-defaultsign="az">{{ 'account'|_ }}</th>
<a href="{{ route('accounts.show', row.id) }}">{{ row.name }}</a> <th data-defaultsign="_19">{{ 'spent_average'|_ }}</th>
</td> <th data-defaultsign="_19">{{ 'total'|_ }}</th>
<td data-value="{{ row.average }}"> <th data-defaultsign="_19">{{ 'transaction_count'|_ }}</th>
{{ row.average|formatAmount }}
</td>
<td data-value="{{ row.sum }}">
{{ row.sum|formatAmount }}
</td>
<td data-value="{{ row.count }}">
{{ row.count }}
</td>
</tr> </tr>
{% endfor %} </thead>
</tbody> <tbody>
</table> {% for row in averageExpenses %}
<tr>
<td data-value="{{ row.name }}">
<a href="{{ route('accounts.show', row.id) }}">{{ row.name }}</a>
</td>
<td data-value="{{ row.average }}">
{{ row.average|formatAmount }}
</td>
<td data-value="{{ row.sum }}">
{{ row.sum|formatAmount }}
</td>
<td data-value="{{ row.count }}">
{{ row.count }}
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div> </div>
</div> </div>
</div> {% endif %}
<div class="col-lg-6"> {% if topExpenses.count > 0 %}
{% if topExpenses.count > 0 %} <div class="col-lg-6">
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'expenses'|_ }} ({{ trans('firefly.topX', {number: listLength}) }})</h3> <h3 class="box-title">{{ 'expenses'|_ }} ({{ trans('firefly.topX', {number: listLength}) }})</h3>
@@ -250,8 +253,8 @@
</table> </table>
</div> </div>
</div> </div>
{% endif %} </div>
</div> {% endif %}
</div> </div>
<div class="row"> <div class="row">
{% if averageIncome|length > 0 %} {% if averageIncome|length > 0 %}

2
routes/web.php
View File

@@ -619,7 +619,7 @@ Route::group(
* Transaction Mass Controller * Transaction Mass Controller
*/ */
Route::group( Route::group(
['middleware' => 'user-full-auth', 'namespace' => 'Transaction', 'prefix' => 'transactions/mass', 'as' => 'transactions.mass'], function () { ['middleware' => 'user-full-auth', 'namespace' => 'Transaction', 'prefix' => 'transactions/mass', 'as' => 'transactions.mass.'], function () {
Route::get('edit/{journalList}', ['uses' => 'MassController@edit', 'as' => 'edit']); Route::get('edit/{journalList}', ['uses' => 'MassController@edit', 'as' => 'edit']);
Route::get('delete/{journalList}', ['uses' => 'MassController@delete', 'as' => 'delete']); Route::get('delete/{journalList}', ['uses' => 'MassController@delete', 'as' => 'delete']);
Route::post('update', ['uses' => 'MassController@update', 'as' => 'update']); Route::post('update', ['uses' => 'MassController@update', 'as' => 'update']);