From 9bcd56f969d582dc08884dd74f60eaf3668407db Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Tue, 4 May 2021 13:51:16 +0200 Subject: [PATCH] limit GDD to 2 decimal places --- community_server/src/Model/Entity/StateBalance.php | 3 ++- community_server/src/Model/Table/TransactionsTable.php | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/community_server/src/Model/Entity/StateBalance.php b/community_server/src/Model/Entity/StateBalance.php index a4407613d..4303ba1ac 100644 --- a/community_server/src/Model/Entity/StateBalance.php +++ b/community_server/src/Model/Entity/StateBalance.php @@ -3,6 +3,7 @@ namespace App\Model\Entity; use Cake\ORM\Entity; use Cake\I18n\Time; +use Cake\I18n\Number; /** * StateBalance Entity @@ -70,7 +71,7 @@ class StateBalance extends Entity protected function _getAmountFloat() { - return floatval($this->amount) / 10000.0; + return Number::format(floatval($this->amount) / 10000.0, ['precision' => 2]); } public function partDecay($target_date) diff --git a/community_server/src/Model/Table/TransactionsTable.php b/community_server/src/Model/Table/TransactionsTable.php index 933c52b1c..6cd715874 100644 --- a/community_server/src/Model/Table/TransactionsTable.php +++ b/community_server/src/Model/Table/TransactionsTable.php @@ -6,7 +6,7 @@ use Cake\ORM\RulesChecker; use Cake\ORM\Table; use Cake\Validation\Validator; use Cake\ORM\TableRegistry; - +use Cake\I18n\Number; /** * Transactions Model * @@ -188,7 +188,7 @@ class TransactionsTable extends Table //echo "prev balance: " . $prev->balance . ", diff_amount: $diff_amount, summe: " . (-intval($prev->balance - $diff_amount)) . "
"; $final_transactions[] = [ 'type' => 'decay', - 'balance' => floatval(-intval($prev->balance - $diff_amount)) / 10000.0, + 'balance' => Number::format(floatval(-intval($prev->balance - $diff_amount)) / 10000.0, ['precision' => 2]), 'decay_duration' => $interval->format('%a days, %H hours, %I minutes, %S seconds'), 'memo' => '' ]; @@ -256,7 +256,7 @@ class TransactionsTable extends Table $state_balance->record_date = $su_transaction->balance_date; $final_transactions[] = [ 'type' => 'decay', - 'balance' => floatval(-intval($su_transaction->balance - $state_balance->decay)) / 10000, + 'balance' => Number::format(floatval(-intval($su_transaction->balance - $state_balance->decay)) / 10000.0, ['precision' => 2]), 'decay_duration' => $su_transaction->balance_date->timeAgoInWords(), 'memo' => '' ];