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

remove gdt from listTransactions because it is already in listGDTTransactions, prevent synchronous call to gdt server, prevent double modificator

Browse Source
This commit is contained in:
einhornimmond 2021-08-10 11:45:11 +02:00
parent b48bbbb711
commit 4fbc01b907
4 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -325,17 +325,6 @@ class AppRequestsController extends AppController
$transactionsTable = TableRegistry::getTableLocator()->get('Transactions'); $transactionsTable = TableRegistry::getTableLocator()->get('Transactions');
$stateBalancesTable->updateBalances($user['id']); $stateBalancesTable->updateBalances($user['id']);
$gdtSum = 0;
$gdtEntries = $this->JsonRequestClient->sendRequestGDT(['email' => $user['email']], 'GdtEntries' . DS . 'sumPerEmailApi');
if('success' == $gdtEntries['state'] && 'success' == $gdtEntries['data']['state']) {
$gdtSum = intval($gdtEntries['data']['sum']);
} else {
$this->addAdminError('StateBalancesController', 'overview', $gdtEntries, $user['id'] ? $user['id'] : 0);
}
//echo "count: $count, page: $page<br>"; //echo "count: $count, page: $page<br>";
$limit = $count; $limit = $count;
$offset = 0; $offset = 0;
@ -389,7 +378,6 @@ class AppRequestsController extends AppController
'transactions' => $transactions, 'transactions' => $transactions,
'transactionExecutingCount' => $session->read('Transactions.executing'), 'transactionExecutingCount' => $session->read('Transactions.executing'),
'count' => $stateUserTransactionsQuery->count(), 'count' => $stateUserTransactionsQuery->count(),
'gdtSum' => $gdtSum,
'timeUsed' => microtime(true) - $startTime 'timeUsed' => microtime(true) - $startTime
]; ];
$now = new FrozenTime(); $now = new FrozenTime();

1
community_server/src/Template/AppRequests/list_transactions.ctp
View File

@ -8,7 +8,6 @@
$body['balance'] = $this->element('centToFloat', ['cent' => $body['balance'], 'precision' => 4]); $body['balance'] = $this->element('centToFloat', ['cent' => $body['balance'], 'precision' => 4]);
$body['decay'] = $this->element('centToFloat', ['cent' => $body['decay'], 'precision' => 4]); $body['decay'] = $this->element('centToFloat', ['cent' => $body['decay'], 'precision' => 4]);
$body['gdtSum'] = $this->element('centToFloat', ['cent' => $body['gdtSum'], 'precision' => 2]);
foreach($body['transactions'] as $i => $transaction) { foreach($body['transactions'] as $i => $transaction) {
$useCeil = false; $useCeil = false;

1
docker-compose.override.yml
View File

@ -52,6 +52,7 @@ services:
- mariadb - mariadb
networks: networks:
- internal-net - internal-net
- external-net
volumes: volumes:
- ./community_server/config/php-fpm/php-ini-overrides.ini:/etc/php/7.4/fpm/conf.d/99-overrides.ini - ./community_server/config/php-fpm/php-ini-overrides.ini:/etc/php/7.4/fpm/conf.d/99-overrides.ini
- ./community_server/src:/var/www/cakephp/src - ./community_server/src:/var/www/cakephp/src

2
frontend/src/views/Layout/DashboardLayout_gdd.vue
View File

@ -133,7 +133,6 @@ export default {
pagination.items, pagination.items,
) )
if (result.success) { if (result.success) {
this.GdtBalance = Number(result.result.data.gdtSum)
this.transactions = result.result.data.transactions this.transactions = result.result.data.transactions
this.balance = Number(result.result.data.decay) this.balance = Number(result.result.data.decay)
this.bookedBalance = Number(result.result.data.balance) this.bookedBalance = Number(result.result.data.balance)
@ -149,6 +148,7 @@ export default {
console.log(' communityAPI.transactionsgdt') console.log(' communityAPI.transactionsgdt')
console.log(result2.result) console.log(result2.result)
console.log(result2.result.data.gdtEntries) console.log(result2.result.data.gdtEntries)
this.GdtBalance = Number(result2.result.data.gdtSum)
this.transactionsGdt = result2.result.data.gdtEntries this.transactionsGdt = result2.result.data.gdtEntries
this.transactionGdtCount = result2.result.data.count this.transactionGdtCount = result2.result.data.count
/* /*