IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

add lost update, prevent also showing negative decay

Browse Source
This commit is contained in:
einhornimmond 2021-05-07 13:04:26 +02:00
parent 5dd0d473db
commit d3c4c4e7aa
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
community_server/src/Model/Table/TransactionsTable.php
View File

@ -183,7 +183,7 @@ class TransactionsTable extends Table
$state_balance->amount = $prev->balance;
$state_balance->record_date = $prev->balance_date;
$diff_amount = $state_balance->partDecay($current->balance_date);
$balance = -intval($prev->balance - $diff_amount);
$balance = floatval(intval($prev->balance - $diff_amount));
// skip small decays (smaller than 0,00 GDD)
if(abs($balance) >= 100) {
@ -258,12 +258,15 @@ class TransactionsTable extends Table
if($i == $stateUserTransactionsCount-1 && $decay == true) {
$state_balance->amount = $su_transaction->balance;
$state_balance->record_date = $su_transaction->balance_date;
$final_transactions[] = [
'type' => 'decay',
'balance' => floatval(intval($su_transaction->balance - $state_balance->decay)),
'decay_duration' => $su_transaction->balance_date->timeAgoInWords(),
'memo' => ''
];
$balance = floatval($su_transaction->balance - $state_balance->decay);
if($balance > 100) {
$final_transactions[] = [
'type' => 'decay',
'balance' => $balance,
'decay_duration' => $su_transaction->balance_date->timeAgoInWords(),
'memo' => ''
];
}
}
}