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

update code for correct transactions listening

Browse Source
This commit is contained in:
Dario Rekowski on RockPI 2021-08-12 11:52:02 +00:00
parent 9cb03befa2
commit a63716f2a5
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
community_server/src/Controller/AppRequestsController.php
View File

@ -340,17 +340,13 @@ class AppRequestsController extends AppController
$limit = $count;
$offset = 0;
$skip_first_transaction = false;
if($page == 1) {
$limit--;
} else {
if($page > 1) {
$offset = (( $page - 1 ) * $count) - 1;
}
if($offset) {
$limit++;
$skip_first_transaction = true;
if($orderDirection == 'ASC') {
$offset--;
}
}
if($offset && $orderDirection == 'ASC') {
$offset--;
}
//echo "limit: $limit, offset: $offset, skip first transaction: $skip_first_transaction<br>";
@ -363,6 +359,11 @@ class AppRequestsController extends AppController
//->page($page)
->offset($offset)
;
$state_user_transactions_count = $stateUserTransactionsQuery->count();
if($state_user_transactions_count > $offset + $limit) {
$skip_first_transaction = true;
}
$decay = true;
if($page > 1) {
$decay = false;
@ -388,7 +389,7 @@ class AppRequestsController extends AppController
'state' => 'success',
'transactions' => $transactions,
'transactionExecutingCount' => $session->read('Transactions.executing'),
'count' => $stateUserTransactionsQuery->count(),
'count' => $state_user_transactions_count,
'gdtSum' => $gdtSum,
'timeUsed' => microtime(true) - $startTime
];
@ -409,8 +410,6 @@ class AppRequestsController extends AppController
public function listGDTTransactions($page = 1, $count = 25, $orderDirection = 'ASC', $session_id = 0)
{
$timeBegin = microtime(true);
$gdtSum = 0;
$gdtCount = -1;
$this->viewBuilder()->setLayout('ajax');
$login_result = $this->requestLogin($session_id, false);
@ -432,8 +431,6 @@ class AppRequestsController extends AppController
'orderDirection' => $orderDirection
], 'GdtEntries' . DS . 'listPerEmailApi');
$transactions = [];
$result = ['state' => 'success'];
if('success' == $gdtEntries['state']) {
$timeEnd = microtime(true);
$gdtEntries['data']['timeUsed'] = $timeEnd - $timeBegin;