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 some duplication.

Browse Source
This commit is contained in:
James Cole
2015-07-06 17:45:59 +02:00
parent 3fb14b4708
commit a4cc25175a
4 changed files with 15 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Generator/Chart/Bill/ChartJsBillChartGenerator.php
View File

@@ -31,12 +31,13 @@ class ChartJsBillChartGenerator implements BillChartGenerator
$unpaidDescriptions = [];
$unpaidAmount = 0;
bcscale(2);
/** @var TransactionJournal $entry */
foreach ($paid as $entry) {
$paidDescriptions[] = $entry->description;
$paidAmount += floatval($entry->amount);
$paidAmount = bcadd($paidAmount, $entry->amount);
}
// loop unpaid:
@@ -45,7 +46,7 @@ class ChartJsBillChartGenerator implements BillChartGenerator
$description = $entry[0]->name . ' (' . $entry[1]->format('jS M Y') . ')';
$amount = ($entry[0]->amount_max + $entry[0]->amount_min) / 2;
$unpaidDescriptions[] = $description;
$unpaidAmount += $amount;
$unpaidAmount = bcadd($unpaidAmount, $amount);
unset($amount, $description);
}

12
app/Generator/Chart/Bill/GoogleBillChartGenerator.php
View File

@@ -30,12 +30,14 @@ class GoogleBillChartGenerator implements BillChartGenerator
$unpaidDescriptions = [];
$unpaidAmount = 0;
bcscale(2);
/** @var TransactionJournal $entry */
foreach ($paid as $entry) {
$paidDescriptions[] = $entry->description;
$paidAmount += floatval($entry->amount);
$paidAmount = bcadd($paidAmount, $entry->amount);
}
// loop unpaid:
@@ -44,7 +46,7 @@ class GoogleBillChartGenerator implements BillChartGenerator
$description = $entry[0]->name . ' (' . $entry[1]->format('jS M Y') . ')';
$amount = ($entry[0]->amount_max + $entry[0]->amount_min) / 2;
$unpaidDescriptions[] = $description;
$unpaidAmount += $amount;
$unpaidAmount = bcadd($unpaidAmount, $amount);
unset($amount, $description);
}
@@ -77,7 +79,11 @@ class GoogleBillChartGenerator implements BillChartGenerator
/** @var TransactionJournal $result */
foreach ($entries as $result) {
$chart->addRow(clone $result->date, floatval($bill->amount_max), floatval($bill->amount_min), floatval($result->amount));
$chart->addRow(
clone $result->date,
floatval($bill->amount_max),
floatval($bill->amount_min),
floatval($result->amount));
}
$chart->generate();