From f326adb6a623e05edb6a2312d4e0c2a34fc30041 Mon Sep 17 00:00:00 2001 From: Dario Rekowski on RockPI Date: Wed, 5 May 2021 17:40:30 +0000 Subject: [PATCH 01/30] don't show decays smaller than 0,01 GDD --- .../src/Model/Table/TransactionsTable.php | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/community_server/src/Model/Table/TransactionsTable.php b/community_server/src/Model/Table/TransactionsTable.php index 00f00b904..301894a61 100644 --- a/community_server/src/Model/Table/TransactionsTable.php +++ b/community_server/src/Model/Table/TransactionsTable.php @@ -183,15 +183,19 @@ class TransactionsTable extends Table $state_balance->amount = $prev->balance; $state_balance->record_date = $prev->balance_date; $diff_amount = $state_balance->partDecay($current->balance_date); - - //echo $interval->format('%R%a days'); - //echo "prev balance: " . $prev->balance . ", diff_amount: $diff_amount, summe: " . (-intval($prev->balance - $diff_amount)) . "
"; - $final_transactions[] = [ - 'type' => 'decay', - 'balance' => -intval($prev->balance - $diff_amount), - 'decay_duration' => $interval->format('%a days, %H hours, %I minutes, %S seconds'), - 'memo' => '' - ]; + $balance = -intval($prev->balance - $diff_amount); + // skip small decays (smaller than 0,00 GDD) + + if(abs($balance) > 100) { + //echo $interval->format('%R%a days'); + //echo "prev balance: " . $prev->balance . ", diff_amount: $diff_amount, summe: " . (-intval($prev->balance - $diff_amount)) . "
"; + $final_transactions[] = [ + 'type' => 'decay', + 'balance' => -intval($prev->balance - $diff_amount), + 'decay_duration' => $interval->format('%a days, %H hours, %I minutes, %S seconds'), + 'memo' => '' + ]; + } } } From 837e0f4fc6c543f8e27cd71033d00f573ceb22bd Mon Sep 17 00:00:00 2001 From: Dario Rekowski on RockPI Date: Wed, 5 May 2021 17:42:18 +0000 Subject: [PATCH 02/30] calculate only once --- community_server/src/Model/Table/TransactionsTable.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community_server/src/Model/Table/TransactionsTable.php b/community_server/src/Model/Table/TransactionsTable.php index 301894a61..790b7b5f0 100644 --- a/community_server/src/Model/Table/TransactionsTable.php +++ b/community_server/src/Model/Table/TransactionsTable.php @@ -191,7 +191,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' => -intval($prev->balance - $diff_amount), + 'balance' => $balance, 'decay_duration' => $interval->format('%a days, %H hours, %I minutes, %S seconds'), 'memo' => '' ]; From 3c566aca9b2ca257d554e788f33806d3d0bffefb Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Thu, 6 May 2021 12:28:14 +0200 Subject: [PATCH 03/30] Update community_server/src/Model/Table/TransactionsTable.php Co-authored-by: Ulf Gebhardt --- community_server/src/Model/Table/TransactionsTable.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community_server/src/Model/Table/TransactionsTable.php b/community_server/src/Model/Table/TransactionsTable.php index 790b7b5f0..b577afd7d 100644 --- a/community_server/src/Model/Table/TransactionsTable.php +++ b/community_server/src/Model/Table/TransactionsTable.php @@ -186,7 +186,7 @@ class TransactionsTable extends Table $balance = -intval($prev->balance - $diff_amount); // skip small decays (smaller than 0,00 GDD) - if(abs($balance) > 100) { + if(abs($balance) >= 100) { //echo $interval->format('%R%a days'); //echo "prev balance: " . $prev->balance . ", diff_amount: $diff_amount, summe: " . (-intval($prev->balance - $diff_amount)) . "
"; $final_transactions[] = [ From 34d00d865e56ea0eda8f72bc59cbace2ff597073 Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 6 May 2021 13:47:04 +0200 Subject: [PATCH 04/30] my profile auskommentiert --- frontend/src/views/Layout/DashboardLayout_gdd.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue index 5fc696574..26ae95b98 100755 --- a/frontend/src/views/Layout/DashboardLayout_gdd.vue +++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue @@ -9,10 +9,10 @@ {{ $t('transactions') }} +