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

Continued working on category controller [skip ci]

Browse Source
This commit is contained in:
James Cole
2014-07-30 14:45:46 +02:00
parent 04a9ada682
commit 00a767cfc9
22 changed files with 619 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/lib/Firefly/Helper/Controllers/Category.php Normal file
View File

@@ -0,0 +1,24 @@
<?php
/**
* Created by PhpStorm.
* User: User
* Date: 30-7-14
* Time: 10:57
*/
namespace Firefly\Helper\Controllers;
use Carbon\Carbon;
class Category implements CategoryInterface
{
public function journalsInRange(\Category $category, Carbon $start, Carbon $end)
{
return $category->transactionjournals()->
with(['transactions','transactions.account','transactiontype','components'])->
orderBy('date','DESC')->orderBy('id','DESC')->before($end)->after($start)->get();
}
}

18
app/lib/Firefly/Helper/Controllers/CategoryInterface.php Normal file
View File

@@ -0,0 +1,18 @@
<?php
/**
* Created by PhpStorm.
* User: User
* Date: 30-7-14
* Time: 10:57
*/
namespace Firefly\Helper\Controllers;
use Carbon\Carbon;
interface CategoryInterface {
public function journalsInRange(\Category $category, Carbon $start, Carbon $end);
}

148
app/lib/Firefly/Helper/Controllers/Chart.php
View File

@@ -36,7 +36,7 @@ class Chart implements ChartInterface
{
$result = [
'rows' => [],
'sum' => 0
'sum' => 0
];
if ($account) {
// get journals in range:
@@ -85,7 +85,7 @@ class Chart implements ChartInterface
$data = [];
$budgets = \Auth::user()->budgets()->with(
['limits' => function ($q) {
['limits' => function ($q) {
$q->orderBy('limits.startdate', 'ASC');
}, 'limits.limitrepetitions' => function ($q) use ($start) {
$q->orderBy('limit_repetitions.startdate', 'ASC');
@@ -154,6 +154,136 @@ class Chart implements ChartInterface
return $data;
}
public function categoryShowChart(\Category $category, $range, Carbon $start, Carbon $end)
{
$data = ['name' => $category->name . ' per ' . $range, 'data' => []];
// go back twelve periods. Skip if empty.
$beginning = clone $start;
switch ($range) {
default:
throw new FireflyException('No beginning for range ' . $range);
break;
case '1D':
$beginning->subDays(12);
break;
case '1W':
$beginning->subWeeks(12);
break;
case '1M':
$beginning->subYear();
break;
case '3M':
$beginning->subYears(3);
break;
case '6M':
$beginning->subYears(6);
break;
}
// loop over the periods:
while ($beginning <= $start) {
// increment currentEnd to fit beginning:
$currentEnd = clone $beginning;
// increase beginning for next round:
switch ($range) {
default:
throw new FireflyException('No currentEnd incremental for range ' . $range);
break;
case '1D':
break;
case '1W':
$currentEnd->addWeek()->subDay();
break;
case '1M':
$currentEnd->addMonth()->subDay();
break;
case '3M':
$currentEnd->addMonths(3)->subDay();
break;
case '6M':
$currentEnd->addMonths(6)->subDay();
}
// now format the current range:
$title = '';
switch ($range) {
default:
throw new \Firefly\Exception\FireflyException('No date formats for frequency "' . $range . '"!');
break;
case '1D':
$title = $beginning->format('j F Y');
break;
case '1W':
$title = $beginning->format('\W\e\e\k W, Y');
break;
case '1M':
$title = $beginning->format('F Y');
break;
case '3M':
case '6M':
$title = $beginning->format('M Y') . ' - ' . $currentEnd->format('M Y');
break;
case 'yearly':
// return $this->startdate->format('Y');
break;
}
// get sum for current range:
$journals = \TransactionJournal::
with(
['transactions' => function ($q) {
$q->where('amount', '>', 0);
}]
)
->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
->where('transaction_types.type', 'Withdrawal')
->leftJoin('component_transaction_journal', 'component_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
->leftJoin('components', 'components.id', '=', 'component_transaction_journal.component_id')
->where('components.id', '=', $category->id)
//->leftJoin()
->after($beginning)->before($currentEnd)
->where('completed', 1)
->get(['transaction_journals.*']);
$currentSum = 0;
foreach ($journals as $journal) {
if (!isset($journal->transactions[0])) {
throw new FireflyException('Journal #' . $journal->id . ' has ' . count($journal->transactions)
. ' transactions!');
}
$transaction = $journal->transactions[0];
$amount = floatval($transaction->amount);
$currentSum += $amount;
}
$data['data'][] = [$title, $currentSum];
// increase beginning for next round:
switch ($range) {
default:
throw new FireflyException('No incremental for range ' . $range);
break;
case '1D':
$beginning->addDay();
break;
case '1W':
$beginning->addWeek();
break;
case '1M':
$beginning->addMonth();
break;
case '3M':
$beginning->addMonths(3);
break;
case '6M':
$beginning->addMonths(6);
break;
}
}
return $data;
}
public function categories(Carbon $start, Carbon $end)
{
@@ -192,8 +322,7 @@ class Chart implements ChartInterface
// sort
arsort($result);
$chartData = [
];
$chartData = [];
foreach ($result as $name => $value) {
$chartData[] = [$name, $value];
}
@@ -202,15 +331,4 @@ class Chart implements ChartInterface
return $chartData;
}
public function accountXX(\Account $account)
{
$data = [
'chart_title' => $account->name,
'subtitle' => '<a href="' . route('accounts.show', [$account->id]) . '">View more</a>',
'series' => [$this->_account($account)]
];
return $data;
}
}

2
app/lib/Firefly/Helper/Controllers/ChartInterface.php
View File

@@ -21,4 +21,6 @@ interface ChartInterface
public function budgets(Carbon $start);
public function accountDailySummary(\Account $account, Carbon $date);
public function categoryShowChart(\Category $category, $range, Carbon $start, Carbon $end);
}

4
app/lib/Firefly/Helper/HelperServiceProvider.php
View File

@@ -26,6 +26,10 @@ class HelperServiceProvider extends ServiceProvider
'Firefly\Helper\Controllers\ChartInterface',
'Firefly\Helper\Controllers\Chart'
);
$this->app->bind(
'Firefly\Helper\Controllers\CategoryInterface',
'Firefly\Helper\Controllers\Category'
);
$this->app->bind(
'Firefly\Helper\Controllers\BudgetInterface',

2
app/lib/Firefly/Storage/Budget/BudgetRepositoryInterface.php
View File

@@ -40,7 +40,7 @@ interface BudgetRepositoryInterface
*
* @return mixed
*/
public function destroy($data);
public function destroy($budgetId);
/**
* @param $budgetId

14
app/lib/Firefly/Storage/Category/CategoryRepositoryInterface.php
View File

@@ -14,6 +14,7 @@ interface CategoryRepositoryInterface
* @return mixed
*/
public function get();
public function find($categoryId);
/**
* @param $name
@@ -30,10 +31,19 @@ interface CategoryRepositoryInterface
public function findByName($name);
/**
* @param $name
* @param $data
*
* @return mixed
*/
public function store($name);
public function store($data);
public function update($data);
/**
* @param $data
*
* @return mixed
*/
public function destroy($categoryId);
}

40
app/lib/Firefly/Storage/Category/EloquentCategoryRepository.php
View File

@@ -14,7 +14,12 @@ class EloquentCategoryRepository implements CategoryRepositoryInterface
*/
public function get()
{
return \Auth::user()->categories()->orderBy('name','ASC')->get();
return \Auth::user()->categories()->orderBy('name', 'ASC')->get();
}
public function find($categoryId)
{
return \Auth::user()->categories()->find($categoryId);
}
/**
@@ -26,7 +31,7 @@ class EloquentCategoryRepository implements CategoryRepositoryInterface
{
$category = $this->findByName($name);
if (!$category) {
return $this->store($name);
return $this->store(['name' => $name]);
}
return $category;
@@ -54,14 +59,39 @@ class EloquentCategoryRepository implements CategoryRepositoryInterface
*
* @return \Category|mixed
*/
public function store($name)
public function store($data)
{
$category = new \Category();
$category->name = $name;
$category = new \Category;
$category->name = $data['name'];
$category->user()->associate(\Auth::user());
$category->save();
return $category;
}
public function update($data)
{
$category = $this->find($data['id']);
if ($category) {
// update account accordingly:
$category->name = $data['name'];
if ($category->validate()) {
$category->save();
}
}
return $category;
}
public function destroy($categoryId)
{
$category = $this->find($categoryId);
if ($category) {
$category->delete();
return true;
}
return false;
}
}

2
app/lib/Firefly/Storage/StorageServiceProvider.php
View File

@@ -27,6 +27,8 @@ class StorageServiceProvider extends ServiceProvider
);
$this->app->bind(
'Firefly\Storage\Account\AccountRepositoryInterface',
'Firefly\Storage\Account\EloquentAccountRepository'