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

Add decryption routine.

Browse Source
This commit is contained in:
James Cole
2015-03-31 21:18:22 +02:00
parent cf23858c10
commit 566fadad15
5 changed files with 43 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Helpers/Report/ReportQuery.php
View File

@@ -244,7 +244,9 @@ class ReportQuery implements ReportQueryInterface
DB::Raw('SUM(`t_to`.`amount`) as `amount`'),
'transaction_journals.date',
't_from.account_id as account_id',
'ac_from.name as name']
'ac_from.name as name',
'ac_from.encrypted as account_encrypted'
]
);
}
@@ -323,7 +325,7 @@ class ReportQuery implements ReportQueryInterface
->groupBy('categories.id')
->orderBy('amount');
return $query->get(['categories.id','categories.encrypted', 'categories.name', DB::Raw('SUM(`transactions`.`amount`) AS `amount`')]);
return $query->get(['categories.id', 'categories.encrypted', 'categories.name', DB::Raw('SUM(`transactions`.`amount`) AS `amount`')]);
}
@@ -370,7 +372,7 @@ class ReportQuery implements ReportQueryInterface
->groupBy('t_to.account_id')
->orderBy('amount', 'DESC');
return $query->get(['t_to.account_id as id', 'ac_to.name as name', DB::Raw('SUM(t_to.amount) as `amount`')]);
return $query->get(['t_to.account_id as id', 'ac_to.name as name', 'ac_to.encrypted', DB::Raw('SUM(t_to.amount) as `amount`')]);
}
/**
@@ -412,7 +414,9 @@ class ReportQuery implements ReportQueryInterface
$query->groupBy('t_from.account_id')->orderBy('amount');
return $query->get(['t_from.account_id as account_id', 'ac_from.name as name', DB::Raw('SUM(t_from.amount) as `amount`')]);
return $query->get(
['t_from.account_id as account_id', 'ac_from.name as name', 'ac_from.encrypted as encrypted', DB::Raw('SUM(t_from.amount) as `amount`')]
);
}
/**

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

@@ -247,6 +247,7 @@ class ReportController extends Controller
* Start getExpenseGroupedForMonth DONE
*/
$set = $this->query->journalsByExpenseAccount($start, $end, $showSharedReports);
$expenses = Steam::makeArray($set);
$expenses = Steam::sortArray($expenses);
$expenses = Steam::limitArray($expenses, 10);
@@ -268,6 +269,7 @@ class ReportController extends Controller
$result = $this->query->journalsByCategory($start, $end);
$categories = Steam::makeArray($result);
// loop and decrypt if necessary:
foreach ($categories as $index => $category) {
$categories[$index]['name']
@@ -283,6 +285,7 @@ class ReportController extends Controller
$merged = $categories;
}
// sort.
$sorted = Steam::sortNegativeArray($merged);

8
app/Support/Steam.php
View File

@@ -100,11 +100,13 @@ class Steam
if (isset($array[$id])) {
$array[$id]['amount'] += floatval($entry->amount);
$array[$id]['spent'] += floatval($entry->spent);
$array[$id]['encrypted'] = intval($entry->encrypted);
} else {
$array[$id] = [
'amount' => floatval($entry->amount),
'spent' => floatval($entry->spent),
'name' => $entry->name
'amount' => floatval($entry->amount),
'spent' => floatval($entry->spent),
'encrypted' => intval($entry->encrypted),
'name' => $entry->name
];
}
}