diff --git a/community_server/src/Controller/AppRequestsController.php b/community_server/src/Controller/AppRequestsController.php
index 018e0af49..4b81b8ac9 100644
--- a/community_server/src/Controller/AppRequestsController.php
+++ b/community_server/src/Controller/AppRequestsController.php
@@ -25,7 +25,7 @@ class AppRequestsController extends AppController
$this->loadComponent('GradidoNumber');
//$this->loadComponent('JsonRpcRequestClient');
//$this->Auth->allow(['add', 'edit']);
- $this->Auth->allow(['index', 'sendCoins', 'createCoins', 'getBalance', 'listTransactions']);
+ $this->Auth->allow(['index', 'sendCoins', 'createCoins', 'getBalance', 'listTransactions', 'getDecayStartBlock']);
}
@@ -335,11 +335,21 @@ class AppRequestsController extends AppController
$limit = $count;
$offset = 0;
+ $skip_first_transaction = false;
if($page == 1) {
$limit--;
} else {
$offset = (( $page - 1 ) * $count) - 1;
}
+ if($offset && $orderDirection == 'ASC') {
+ // move cursor one step backwards to able to load one transaction previous last which will be shown for decay calculation
+ $offset--;
+ $limit++;
+ $skip_first_transaction = true;
+ } else if($orderDirection == 'DESC') {
+ $limit++;
+ $skip_first_transaction = true;
+ }
$stateUserTransactionsQuery = $stateUserTransactionsTable
->find()
@@ -362,7 +372,7 @@ class AppRequestsController extends AppController
$transactions_from_db = array_reverse($transactions_from_db);
}
- $transactions = $transactionsTable->listTransactionsHumanReadable($transactions_from_db, $user, $decay);
+ $transactions = $transactionsTable->listTransactionsHumanReadable($transactions_from_db, $user, $decay, $skip_first_transaction);
if($orderDirection == 'DESC') {
$transactions = array_reverse($transactions);
diff --git a/community_server/src/Model/Table/TransactionsTable.php b/community_server/src/Model/Table/TransactionsTable.php
index 8fcd81489..925f6f31e 100644
--- a/community_server/src/Model/Table/TransactionsTable.php
+++ b/community_server/src/Model/Table/TransactionsTable.php
@@ -133,11 +133,12 @@ class TransactionsTable extends Table
}
- public function listTransactionsHumanReadable($stateUserTransactions, array $user, $decay = true)
+ public function listTransactionsHumanReadable($stateUserTransactions, array $user, $decay = true, $skip_first_transaction = false)
{
$stateUsersTable = TableRegistry::getTableLocator()->get('StateUsers');
$stateBalancesTable = TableRegistry::getTableLocator()->get('StateBalances');
+ $transactionsTable = TableRegistry::getTableLocator()->get('Transactions');
$transaction_ids = [];
$involved_user_ids = [];
@@ -162,11 +163,15 @@ class TransactionsTable extends Table
$state_balance = $stateBalancesTable->newEntity();
$final_transactions = [];
+ $decay_start_transaction = $transactionsTable->find()->where(['transaction_type_id' => 9]);
+ $decay_start_transaction_id = 0;
+ if($decay_start_transaction->count()) {
+ $decay_start_transaction_id = $decay_start_transaction->first()->id;
+ }
+ $decay_start_time = $stateBalancesTable->getDecayStartDateCached()->getTimestamp();
foreach($stateUserTransactions as $i => $su_transaction)
{
-
-
// sender or receiver when user has sended money
// group name if creation
// type: gesendet / empfangen / geschöpft
@@ -187,7 +192,8 @@ class TransactionsTable extends Table
}
if($prev)
{
- if($prev->balance > 0) {
+ if($prev->balance > 0)
+ {
$current = $su_transaction;
$calculated_decay = $stateBalancesTable->calculateDecay($prev->balance, $prev->balance_date, $current->balance_date, true);
$balance = floatval($prev->balance - $calculated_decay['balance']);
@@ -199,7 +205,19 @@ class TransactionsTable extends Table
'decay_duration' => $calculated_decay['interval']->format('%a days, %H hours, %I minutes, %S seconds'),
'decay_start' => $calculated_decay['start_date'],
'decay_end' => $calculated_decay['end_date']
- ];
+ ];
+ if($prev->transaction_id < $decay_start_transaction_id &&
+ $current->transaction_id > $decay_start_transaction_id) {
+ $final_transaction['decay']['decay_start_block'] = $decay_start_time;
+ }
+ // hint: use transaction id
+ /*if($calculated_decay['start_date'] < $decay_start_time && $calculated_decay['end_date'] > $decay_start_time) {
+ $final_transaction['decay']['decay_start_block'] = $decay_start_time;
+ } else {
+ echo "start block: " . $decay_start_time . "
";
+ echo "start date: " . $calculated_decay['start_date'] . "
";
+ echo "end date: " . $calculated_decay['end_date']. "