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

Merge branch 'community_list_gdt' into 650-View-for-the-GDT-Transaction-List

Browse Source
This commit is contained in:
Dario Rekowski on RockPI 2021-08-03 15:20:00 +00:00
commit fb22adf38c
2 changed files with 56 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,10 @@ class AppRequestsController extends AppController
$this->loadComponent('GradidoNumber'); $this->loadComponent('GradidoNumber');
//$this->loadComponent('JsonRpcRequestClient'); //$this->loadComponent('JsonRpcRequestClient');
//$this->Auth->allow(['add', 'edit']); //$this->Auth->allow(['add', 'edit']);
$this->Auth->allow(['index', 'sendCoins', 'createCoins', 'getBalance', 'listTransactions', 'getDecayStartBlock']); $this->Auth->allow([
'index', 'sendCoins', 'createCoins', 'getBalance',
'listTransactions','listGDTTransactions', 'getDecayStartBlock'
]);
} }
@ -403,6 +406,56 @@ class AppRequestsController extends AppController
$this->set('body', $body); $this->set('body', $body);
} }
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);
if($login_result !== true) {
return $this->returnJson($login_result);
}
$session = $this->getRequest()->getSession();
$user = $session->read('StateUser');
if(!$user) {
return $this->returnJson(['state' => 'error', 'msg' => 'user not found', 'details' => 'exist a valid session cookie?']);
}
$gdtEntries = $this->JsonRequestClient->sendRequestGDT([
'email' => $user['email'],
'page' => $page,
'count' => $count,
'orderDirection' => $orderDirection
], 'GdtEntries' . DS . 'sumPerEmailApi');
//var_dump($gdtEntries);
$transactions = [];
if('success' == $gdtEntries['state'] && 'success' == $gdtEntries['data']['state']) {
$gdtSum = intval($gdtEntries['data']['sum']);
if(isset($gdtEntries['data']['count'])) {
$gdtCount = intval($gdtEntries['data']['count']);
}
if(isset($gdtEntries['data']['ownEntries'])) {
$transactions = $gdtEntries['data']['ownEntries'];
}
} else {
if($user) {
$this->addAdminError('StateBalancesController', 'ajaxGdtOverview', $gdtEntries, $user['id']);
} else {
$this->addAdminError('StateBalancesController', 'ajaxGdtOverview', $gdtEntries, 0);
}
}
$timeEnd = microtime(true);
return $this->returnJson([
'state' => 'success',
'transactions' => $transactions,
'count' => $gdtEntries['data']['count'],
'timeUsed' => ($timeEnd - $timeBegin) . ' s'
]);
}
public function getDecayStartBlock() public function getDecayStartBlock()
{ {
$transactionsTable = TableRegistry::getTableLocator()->get('Transactions'); $transactionsTable = TableRegistry::getTableLocator()->get('Transactions');

22
community_server/src/Controller/StateBalancesController.php
View File

@ -66,35 +66,13 @@ class StateBalancesController extends AppController
$this->addAdminError('StateBalances', 'overview', $update_balance_result, $user['id']); $this->addAdminError('StateBalances', 'overview', $update_balance_result, $user['id']);
} }
// sendRequestGDT
// listPerEmailApi
$gdtSum = 0;
//if('admin' === $user['role']) {
$gdtEntries = $this->JsonRequestClient->sendRequestGDT(['email' => $user['email']], 'GdtEntries' . DS . 'sumPerEmailApi');
//var_dump($gdtEntries);
if('success' == $gdtEntries['state'] && 'success' == $gdtEntries['data']['state']) {
$gdtSum = intval($gdtEntries['data']['sum']);
} else {
if($user) {
$this->addAdminError('StateBalancesController', 'overview', $gdtEntries, $user['id']);
} else {
$this->addAdminError('StateBalancesController', 'overview', $gdtEntries, 0);
}
}
//}
//
//
$stateBalancesTable = TableRegistry::getTableLocator()->get('StateBalances'); $stateBalancesTable = TableRegistry::getTableLocator()->get('StateBalances');
$stateUserTransactionsTable = TableRegistry::getTableLocator()->get('StateUserTransactions'); $stateUserTransactionsTable = TableRegistry::getTableLocator()->get('StateUserTransactions');
$transactionsTable = TableRegistry::getTableLocator()->get('Transactions'); $transactionsTable = TableRegistry::getTableLocator()->get('Transactions');
$stateBalancesTable->updateBalances($user['id']); $stateBalancesTable->updateBalances($user['id']);
$gdtSum = 0; $gdtSum = 0;
$gdtEntries = $this->JsonRequestClient->sendRequestGDT(['email' => $user['email']], 'GdtEntries' . DS . 'sumPerEmailApi'); $gdtEntries = $this->JsonRequestClient->sendRequestGDT(['email' => $user['email']], 'GdtEntries' . DS . 'sumPerEmailApi');
if('success' == $gdtEntries['state'] && 'success' == $gdtEntries['data']['state']) { if('success' == $gdtEntries['state'] && 'success' == $gdtEntries['data']['state']) {
$gdtSum = intval($gdtEntries['data']['sum']); $gdtSum = intval($gdtEntries['data']['sum']);
} else { } else {