kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-24 06:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Expanded reports

Browse Source
This commit is contained in:
James Cole
2014-12-26 21:08:44 +01:00
parent 290f25f1a0
commit 2d67a3159d
6 changed files with 557 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/controllers/ReportController.php
View File

@@ -62,18 +62,20 @@ class ReportController extends BaseController
} catch (Exception $e) {
View::make('error')->with('message', 'Invalid date');
}
$date = new Carbon($year . '-' . $month . '-01');
$date = new Carbon($year . '-' . $month . '-01');
$subTitle = 'Report for ' . $date->format('F Y');
$subTitleIcon = 'fa-calendar';
$income = $this->_repository->getIncomeForMonth($date,false);
$displaySum = true; // to show sums in report.
$income = $this->_repository->getIncomeForMonth($date);
$expenses = $this->_repository->getExpenseGroupedForMonth($date, 10);
$budgets = $this->_repository->getBudgetsForMonth($date);
$categories = $this->_repository->getCategoriesForMonth($date, 10);
$accounts = $this->_repository->getAccountsForMonth($date);
// var_dump($income->toArray());
// exit;
return View::make('reports.month', compact('date', 'subTitle', 'subTitleIcon','income'));
return View::make(
'reports.month',
compact('accounts', 'categories', 'budgets', 'expenses', 'subTitle', 'displaySum', 'subTitleIcon', 'income')
);
}
/**

37
app/database/migrations/2014_12_24_191544_changes_for_v322.php
View File

@@ -13,7 +13,29 @@ class ChangesForV322 extends Migration
*/
public function down()
{
// TODO
// rename tables:
Schema::rename('piggy_bank_repetitions', 'piggybank_repetitions');
Schema::rename('piggy_banks', 'piggybanks');
// rename fields
Schema::table(
'piggy_bank_events', function (Blueprint $table) {
$table->renameColumn('piggy_bank_id', 'piggybank_id');
}
);
Schema::table(
'piggybank_repetitions', function (Blueprint $table) {
$table->renameColumn('piggy_bank_id', 'piggybank_id');
}
);
// remove soft delete to piggy banks
Schema::table(
'piggybanks', function (Blueprint $table) {
$table->dropSoftDeletes();
}
);
}
@@ -28,6 +50,19 @@ class ChangesForV322 extends Migration
Schema::rename('piggybank_repetitions', 'piggy_bank_repetitions');
Schema::rename('piggybanks', 'piggy_banks');
// drop an invalid index.
Schema::table(
'budget_limits', function (Blueprint $table) {
$table->dropIndex('limits_component_id_startdate_repeat_freq_unique');
}
);
// recreate it the correct way:
Schema::table(
'budget_limits', function (Blueprint $table) {
$table->unique(['budget_id', 'startdate', 'repeat_freq'], 'unique_bl_combi');
}
);
// rename fields
Schema::table(
'piggy_bank_events', function (Blueprint $table) {

345
app/lib/FireflyIII/Report/Report.php
View File

@@ -6,7 +6,9 @@ use Carbon\Carbon;
use FireflyIII\Database\Account\Account as AccountRepository;
use FireflyIII\Database\SwitchUser;
use FireflyIII\Database\TransactionJournal\TransactionJournal as JournalRepository;
use Illuminate\Database\Query\JoinClause;
use Illuminate\Support\Collection;
use stdClass;
// todo add methods to itnerface
@@ -80,6 +82,273 @@ class Report implements ReportInterface
}
/**
* @param Carbon $date
*
* @return Collection
*/
public function getAccountsForMonth(Carbon $date)
{
$start = clone $date;
$start->startOfMonth();
$end = clone $date;
$end->endOfMonth();
$list = \Auth::user()->accounts()
->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')
->leftJoin(
'account_meta', function (JoinClause $join) {
$join->on('account_meta.account_id', '=', 'accounts.id')->where('account_meta.name', '=', "accountRole");
}
)
->whereIn('account_types.type', ['Default account', 'Cash account', 'Asset account'])
->where('active', 1)
->where(
function ($query) {
$query->where('account_meta.data', '!=', '"sharedExpense"');
$query->orWhereNull('account_meta.data');
}
)
->get(['accounts.*']);
$list->each(
function (\Account $account) use ($start, $end) {
$account->startBalance = \Steam::balance($account, $start);
$account->endBalance = \Steam::balance($account, $end);
$account->difference = $account->endBalance - $account->startBalance;
}
);
return $list;
}
/**
* @param Carbon $date
*
* @return Collection
*/
public function getBudgetsForMonth(Carbon $date)
{
$start = clone $date;
$start->startOfMonth();
$end = clone $date;
$end->endOfMonth();
// all budgets
/** @var Collection $budgets */
$budgets = \Auth::user()->budgets()
->leftJoin(
'budget_limits', function (JoinClause $join) use ($date) {
$join->on('budget_limits.budget_id', '=', 'budgets.id')->where('budget_limits.startdate', '=', $date->format('Y-m-d'));
}
)
->get(['budgets.*', 'budget_limits.amount as budget_amount']);
$amounts = \Auth::user()->transactionjournals()
->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
->leftJoin('budgets', 'budget_transaction_journal.budget_id', '=', 'budgets.id')
->leftJoin(
'transactions', function (JoinClause $join) {
$join->on('transaction_journals.id', '=', 'transactions.transaction_journal_id')->where('transactions.amount', '<', 0);
}
)
->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
->leftJoin(
'account_meta', function (JoinClause $join) {
$join->on('account_meta.account_id', '=', 'accounts.id')->where('account_meta.name', '=', 'accountRole');
}
)
->leftJoin('transaction_types', 'transaction_journals.transaction_type_id', '=', 'transaction_types.id')
->where('transaction_journals.date', '>=', $start->format('Y-m-d'))
->where('transaction_journals.date', '<=', $end->format('Y-m-d'))
->where('account_meta.data', '!=', '"sharedExpense"')
->where('transaction_types.type', 'Withdrawal')
->groupBy('budgets.id')
->orderBy('name','ASC')
->get(['budgets.id', 'budgets.name', \DB::Raw('SUM(`transactions`.`amount`) AS `sum`')]);
$spentNoBudget = 0;
foreach ($budgets as $budget) {
$budget->spent = 0;
foreach ($amounts as $amount) {
if (intval($budget->id) == intval($amount->id)) {
$budget->spent = floatval($amount->sum) * -1;
}
if (is_null($amount->id)) {
$spentNoBudget = floatval($amount->sum) * -1;
}
}
}
$noBudget = new stdClass;
$noBudget->id = 0;
$noBudget->name = '(no budget)';
$noBudget->budget_amount = 0;
$noBudget->spent = $spentNoBudget;
// also get transfers to expense accounts (which are without a budget, and grouped).
$transfers = $this->getTransfersToSharedAccounts($date);
foreach($transfers as $transfer) {
$noBudget->spent += floatval($transfer->sum) * -1;
}
$budgets->push($noBudget);
return $budgets;
}
/**
* @param Carbon $date
* @param int $limit
*
* @return Collection
*/
public function getCategoriesForMonth(Carbon $date, $limit = 15)
{
$start = clone $date;
$start->startOfMonth();
$end = clone $date;
$end->endOfMonth();
// all categories.
$amounts = \Auth::user()->transactionjournals()
->leftJoin(
'category_transaction_journal', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id'
)
->leftJoin('categories', 'category_transaction_journal.category_id', '=', 'categories.id')
->leftJoin(
'transactions', function (JoinClause $join) {
$join->on('transaction_journals.id', '=', 'transactions.transaction_journal_id')->where('transactions.amount', '<', 0);
}
)
->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
->leftJoin(
'account_meta', function (JoinClause $join) {
$join->on('account_meta.account_id', '=', 'accounts.id')->where('account_meta.name', '=', 'accountRole');
}
)
->leftJoin('transaction_types', 'transaction_journals.transaction_type_id', '=', 'transaction_types.id')
->where('transaction_journals.date', '>=', $start->format('Y-m-d'))
->where('transaction_journals.date', '<=', $end->format('Y-m-d'))
->where('account_meta.data', '!=', '"sharedExpense"')
->where('transaction_types.type', 'Withdrawal')
->groupBy('categories.id')
->orderBy('sum')
->get(['categories.id', 'categories.name', \DB::Raw('SUM(`transactions`.`amount`) AS `sum`')]);
$spentNoCategory = 0;
foreach ($amounts as $amount) {
if (is_null($amount->id)) {
$spentNoCategory = floatval($amount->sum) * -1;
}
}
$noCategory = new stdClass;
$noCategory->id = 0;
$noCategory->name = '(no category)';
$noCategory->sum = $spentNoCategory;
$amounts->push($noCategory);
$return = new Collection;
$bottom = new stdClass();
$bottom->name = 'Others';
$bottom->id = 0;
$bottom->sum = 0;
foreach ($amounts as $index => $entry) {
if ($index < $limit) {
$return->push($entry);
} else {
$bottom->sum += floatval($entry->sum);
}
}
$return->push($bottom);
return $return;
}
/**
* @param Carbon $date
* @param int $limit
*
* @return Collection
*/
public function getExpenseGroupedForMonth(Carbon $date, $limit = 15)
{
$start = clone $date;
$start->startOfMonth();
$end = clone $date;
$end->endOfMonth();
$userId = $this->_accounts->getUser()->id;
$set = \TransactionJournal::
leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
->leftJoin(
'transactions', function (JoinClause $join) {
$join->on('transaction_journals.id', '=', 'transactions.transaction_journal_id')->where(
'transactions.amount', '>', 0
);
}
)
->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
->leftJoin(
'transactions AS otherTransactions', function (JoinClause $join) {
$join->on('transaction_journals.id', '=', 'otherTransactions.transaction_journal_id')->where(
'otherTransactions.amount', '<', 0
);
}
)
->leftJoin('accounts as otherAccounts', 'otherAccounts.id', '=', 'otherTransactions.account_id')
->leftJoin(
'account_meta', function (JoinClause $join) {
$join->on('otherAccounts.id', '=', 'account_meta.account_id')->where('account_meta.name', '=', 'accountRole');
}
)
->where('date', '>=', $start->format('Y-m-d'))
->where('date', '<=', $end->format('Y-m-d'))
->where('account_meta.data', '!=', '"sharedExpense"')
->where('transaction_types.type', 'Withdrawal')
->whereNull('transaction_journals.deleted_at')
->where('transaction_journals.user_id', $userId)
->groupBy('account_id')
->orderBy('sum', 'ASC')
->get(
[
'transactions.account_id',
'accounts.name',
\DB::Raw('SUM(`transactions`.`amount`) * -1 AS `sum`')
]
);
$transfers = $this->getTransfersToSharedAccounts($date);
// merge $transfers into $set
foreach ($transfers as $transfer) {
if (!is_null($transfer->account_id)) {
$set->push($transfer);
}
}
// sort the list.
$set = $set->sortBy(
function ($entry) {
return floatval($entry->sum);
}
);
$return = new Collection;
$bottom = new stdClass();
$bottom->name = 'Others';
$bottom->account_id = 0;
$bottom->sum = 0;
$count = 0;
foreach ($set as $entry) {
if ($count < $limit) {
$return->push($entry);
} else {
$bottom->sum += floatval($entry->sum);
}
$count++;
}
$return->push($bottom);
return $return;
}
/**
* @param Carbon $date
* @param bool $shared
@@ -95,15 +364,87 @@ class Report implements ReportInterface
$userId = $this->_accounts->getUser()->id;
$list = \TransactionJournal::withRelevantData()
->leftJoin('transactions', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
->leftJoin('accounts', 'transactions.account_id', '=', 'accounts.id')
->leftJoin(
'account_meta', function (JoinClause $join) {
$join->on('account_meta.account_id', '=', 'accounts.id')->where('account_meta.name', '=', 'accountRole');
}
)
->transactionTypes(['Deposit'])
->where('user_id', $userId)
->orderBy('date','DESC')
->where('transaction_journals.user_id', $userId)
->where('transactions.amount', '>', 0)
->where('account_meta.data', '!=', '"sharedExpense"')
->orderBy('date', 'ASC')
->before($end)->after($start)->get(['transaction_journals.*']);
// incoming from a shared account: it's profit (income):
$transfers = \TransactionJournal::withRelevantData()
->leftJoin('transactions', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
->leftJoin('accounts', 'transactions.account_id', '=', 'accounts.id')
->leftJoin(
'account_meta', function (JoinClause $join) {
$join->on('account_meta.account_id', '=', 'accounts.id')->where('account_meta.name', '=', 'accountRole');
}
)
->transactionTypes(['Transfer'])
->where('transaction_journals.user_id', $userId)
->where('transactions.amount', '<', 0)
->where('account_meta.data', '=', '"sharedExpense"')
->orderBy('date', 'ASC')
->before($end)->after($start)->get(['transaction_journals.*']);
$list = $list->merge($transfers);
$list->sort(
function (\TransactionJournal $journal) {
return $journal->date->format('U');
}
);
return $list;
}
/**
* @param Carbon $date
*
* @return Collection
*/
public function getTransfersToSharedAccounts(Carbon $date)
{
$start = clone $date;
$start->startOfMonth();
$end = clone $date;
$end->endOfMonth();
return \TransactionJournal::
leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
->leftJoin(
'transactions', function (JoinClause $join) {
$join->on('transactions.transaction_journal_id', '=', 'transaction_journals.id')->where(
'transactions.amount', '>', 0
);
}
)
->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
->leftJoin(
'account_meta', function (JoinClause $join) {
$join->on('account_meta.account_id', '=', 'accounts.id')->where('account_meta.name', '=', 'accountRole');
}
)
->where('account_meta.data', '"sharedExpense"')
->where('date', '>=', $start->format('Y-m-d'))
->where('date', '<=', $end->format('Y-m-d'))
->where('transaction_types.type', 'Transfer')
->where('transaction_journals.user_id', \Auth::user()->id)
->get(
[
'transactions.account_id',
'accounts.name',
\DB::Raw('SUM(`transactions`.`amount`) * -1 AS `sum`')
]
);
}
/**
* @param Carbon $start
*

73
app/lib/FireflyIII/Report/ReportInterface.php
View File

@@ -15,21 +15,57 @@ interface ReportInterface
/**
* @param Carbon $start
* @param Carbon $end
* @param int $limit
*
* @return Collection
*/
public function revenueGroupedByAccount(Carbon $start, Carbon $end, $limit = 15);
/**
* @param Carbon $start
* @param Carbon $end
* @param int $limit
* @param int $limit
*
* @return Collection
*/
public function expensesGroupedByAccount(Carbon $start, Carbon $end, $limit = 15);
/**
* @param Carbon $date
*
* @return Collection
*/
public function getBudgetsForMonth(Carbon $date);
/**
* @param Carbon $date
*
* @return Collection
*/
public function getTransfersToSharedAccounts(Carbon $date);
/**
* @param Carbon $date
* @param int $limit
*
* @return Collection
*/
public function getCategoriesForMonth(Carbon $date, $limit = 15);
/**
* @param Carbon $date
*
* @return Collection
*/
public function getAccountsForMonth(Carbon $date);
/**
* @param Carbon $date
* @param int $limit
*
* @return Collection
*/
public function getExpenseGroupedForMonth(Carbon $date, $limit = 15);
/**
* @param Carbon $date
* @param bool $shared
*
* @return Collection
*/
public function getIncomeForMonth(Carbon $date, $shared = false);
/**
* @param Carbon $start
*
@@ -44,18 +80,19 @@ interface ReportInterface
*/
public function listOfYears(Carbon $start);
/**
* @param Carbon $start
* @param Carbon $end
* @param int $limit
*
* @return Collection
*/
public function revenueGroupedByAccount(Carbon $start, Carbon $end, $limit = 15);
/**
* @param Carbon $date
*
* @return array
*/
public function yearBalanceReport(Carbon $date);
/**
* @param Carbon $date
* @param bool $shared
*
* @return Collection
*/
public function getIncomeForMonth(Carbon $date, $shared = false);
}

11
app/views/list/journals-small.blade.php
View File

@@ -1,10 +1,13 @@
<table class="table table-bordered">
<?php $tableSum = 0;?>
@foreach($journals as $journal)
<tr>
<td>
<a href="{{route('transactions.show',$journal->id)}}" title="{{{$journal->description}}}">{{{$journal->description}}}</a>
</td>
<td>
<?php $tableSum += floatval($journal->transactions[1]->amount);?>
@if($journal->transactiontype->type == 'Withdrawal')
<span class="text-danger">{{mf($journal->transactions[1]->amount,false)}}</span>
@endif
@@ -26,6 +29,12 @@
@endif
</td>
</tr>
@endforeach
@if(isset($displaySum) && $displaySum === true)
<tr>
<td><em>Sum</em></td>
<td colspan="3">{{mf($tableSum)}}</td>
</tr>
@endif
</table>

106
app/views/reports/month.blade.php
View File

@@ -11,7 +11,24 @@
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="panel panel-default">
<div class="panel-heading">Expenses (top 10)</div>
<div class="panel-body">Body</div>
<table class="table table-bordered">
<?php $sum = 0;?>
@foreach($expenses as $expense)
<?php $sum += floatval($expense->sum);?>
<tr>
@if($expense->account_id != 0)
<td><a href="{{route('accounts.show',$expense->account_id)}}">{{{$expense->name}}}</a></td>
@else
<td><em>{{{$expense->name}}}</em></td>
@endif
<td>{{mf($expense->sum)}}</td>
</tr>
@endforeach
<tr>
<td><em>Sum</em></td>
<td>{{mf($sum)}}</td>
</tr>
</table>
</div>
</div>
</div>
@@ -19,13 +36,69 @@
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="panel panel-default">
<div class="panel-heading">Budgets</div>
<div class="panel-body">Body</div>
<table class="table table-bordered">
<tr>
<th>Budget</th>
<th>Envelope</th>
<th>Spent</th>
<th>Left</th>
</tr>
<?php $sum = 0;?>
@foreach($budgets as $budget)
<?php $sum += floatval($budget->spent);?>
<tr>
<td>
@if($budget->id > 0)
<a href="{{route('budgets.show',$budget->id)}}">{{{$budget->name}}}</a>
@else
<em>{{{$budget->name}}}</em>
@endif
</td>
<td>{{mf($budget->budget_amount)}}</td>
<td>{{mf($budget->spent,false)}}</td>
<td>{{mf(floatval($budget->budget_amount) - floatval($budget->spent))}}</td>
</tr>
@endforeach
<tr>
<td colspan="2"><em>Sum</em></td>
<td colspan="2">{{mf($sum)}}</td>
</tr>
</table>
<div class="panel-body">
<em>This list does not take in account outgoing transfers to shared accounts.</em>
</div>
</div>
</div>
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="panel panel-default">
<div class="panel-heading">Categories</div>
<div class="panel-body">Body</div>
<table class="table table-bordered">
<tr>
<th>Category</th>
<th>Spent</th>
</tr>
<?php $sum = 0;?>
@foreach($categories as $category)
<?php $sum += floatval($category->sum);?>
<tr>
<td>
@if($category->id > 0)
<a href="{{route('categories.show',$category->id)}}">{{{$category->name}}}</a>
@else
<em>{{{$category->name}}}</em>
@endif
</td>
<td>{{mf($category->sum,false)}}</td>
</tr>
@endforeach
<tr>
<td><em>Sum</em></td>
<td>{{mf($sum)}}</td>
</tr>
</table>
<div class="panel-body">
<em>This list does not take in account outgoing transfers to shared accounts.</em>
</div>
</div>
</div>
</div>
@@ -33,7 +106,32 @@
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="panel panel-default">
<div class="panel-heading">Accounts</div>
<div class="panel-body">Body</div>
<table class="table table-bordered">
<?php
$sumStart = 0;
$sumEnd = 0;
$sumDiff = 0;
?>
@foreach($accounts as $account)
<?php
$sumStart += $account->startBalance;
$sumEnd += $account->endBalance;
$sumDiff += $account->difference;
?>
<tr>
<td><a href="#">{{{$account->name}}}</a></td>
<td>{{mf($account->startBalance)}}</td>
<td>{{mf($account->endBalance)}}</td>
<td>{{mf($account->difference)}}</td>
</tr>
@endforeach
<tr>
<td><em>Sum</em></td>
<td>{{mf($sumStart)}}</td>
<td>{{mf($sumEnd)}}</td>
<td>{{mf($sumDiff)}}</td>
</tr>
</table>
</div>
</div>
</div>