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 pull request #726 from gradido/community_update_for_gdt_listtransaction_format

Browse Source 
Community update for gdt list GDT transaction format
This commit is contained in:
einhornimmond 2021-08-12 16:10:00 +02:00 committed by GitHub
commit dd066c9fcb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -188,13 +188,28 @@ class StateBalancesController extends AppController
return $result; return $result;
} }
$user = $session->read('StateUser'); $user = $session->read('StateUser');
$requestResult = $this->JsonRequestClient->sendRequestGDT(['email' => $user['email']], 'GdtEntries' . DS . 'listPerEmailApi'); $requestResult = $this->JsonRequestClient->sendRequestGDT([
'email' => $user['email'],
'page' => 1,
'count' => 100,
'orderDirection' => 'DESC'
], 'GdtEntries' . DS . 'listPerEmailApi');
//var_dump($requestResult); //var_dump($requestResult);
if('success' === $requestResult['state'] && 'success' === $requestResult['data']['state']) { if('success' === $requestResult['state'] && 'success' === $requestResult['data']['state'])
{
$moreEntrysAsShown = false;
if(isset($requestResult['data']['count']) && $requestResult['data']['count'] > 100) {
$moreEntrysAsShown = true;
} else {
$moreEntrysAsShown = $requestResult['data']['moreEntrysAsShown'];
}
//var_dump(array_keys($requestResult['data'])); //var_dump(array_keys($requestResult['data']));
if(isset($requestResult['data']['gdtEntries'])) {
$ownEntries = $requestResult['data']['gdtEntries'];
} else {
$ownEntries = $requestResult['data']['ownEntries']; $ownEntries = $requestResult['data']['ownEntries'];
}
//$gdtEntries = $requestResult['data']['entries']; //$gdtEntries = $requestResult['data']['entries'];
$gdtSum = 0; $gdtSum = 0;
@ -217,8 +232,7 @@ class StateBalancesController extends AppController
//echo "gdtSum: $gdtSum<br>"; //echo "gdtSum: $gdtSum<br>";
$this->set('gdtSum', $gdtSum); $this->set('gdtSum', $gdtSum);
$this->set('ownEntries', $ownEntries); $this->set('ownEntries', $ownEntries);
$this->set('gdtSumPerEmail', $requestResult['data']['gdtSumPerEmail']); $this->set('moreEntrysAsShown', $moreEntrysAsShown);
$this->set('moreEntrysAsShown', $requestResult['data']['moreEntrysAsShown']);
$this->set('user', $user); $this->set('user', $user);
if (isset($requestResult['data']['publishers'])) { if (isset($requestResult['data']['publishers'])) {

6
community_server/src/Template/StateBalances/overview_gdt.ctp
View File

@ -19,13 +19,9 @@ function publisherLink($publisher, $the) {
$this->assign('title', __('GDT Kontoübersicht')); $this->assign('title', __('GDT Kontoübersicht'));
$header = '<h3>' . __('Zur Verfügung: ') . '</h3>'; $header = '<h3>' . __('Zur Verfügung: ') . '</h3>';
$gdtSumFromEmails = 0;
foreach($gdtSumPerEmail as $email => $gdt) {
$gdtSumFromEmails += $gdt;
}
if($gdtSum > 0){ if($gdtSum > 0){
$header .= '<h2>'.$this->element('printGDT', ['number' => $gdtSumFromEmails]).'</h2>'; $header .= '<h2>'.$this->element('printGDT', ['number' => $gdtSum]).'</h2>';
} }
if($moreEntrysAsShown) { if($moreEntrysAsShown) {
$header .= '<span>'. __('Nur die letzten 100 Einträge werden angezeigt!') . '</span>'; $header .= '<span>'. __('Nur die letzten 100 Einträge werden angezeigt!') . '</span>';