From 8ead2104cda9544aecfc1be65194aecad1b1ae79 Mon Sep 17 00:00:00 2001 From: Dario Rekowski on RockPI Date: Thu, 9 Apr 2020 07:46:01 +0000 Subject: [PATCH] gdt view flexible --- src/Controller/StateBalancesController.php | 26 ++++++++++++++------- src/Template/StateBalances/overview_gdt.ctp | 4 ++-- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/Controller/StateBalancesController.php b/src/Controller/StateBalancesController.php index 4c7cbe6c1..a2cff0bde 100644 --- a/src/Controller/StateBalancesController.php +++ b/src/Controller/StateBalancesController.php @@ -167,8 +167,9 @@ class StateBalancesController extends AppController if('success' === $requestResult['state'] && 'success' === $requestResult['data']['state']) { //var_dump(array_keys($requestResult['data'])); $ownEntries = $requestResult['data']['ownEntries']; - $connectEntries = $requestResult['data']['connectEntrys']; - $publishers = $requestResult['data']['publishers']; + + + //$gdtEntries = $requestResult['data']['entries']; $gdtSum = 0; @@ -178,18 +179,25 @@ class StateBalancesController extends AppController //var_dump($gdtEntry); } - //$count = 0; - foreach($connectEntries as $entry) { - //if(!$count) var_dump($entry); - //$count++; - $gdtSum += $entry['connect']['gdt_entry']['gdt']; + if(isset($requestResult['data']['connectEntrys'])) { + $connectEntries = $requestResult['data']['connectEntrys']; + + foreach($connectEntries as $entry) { + //if(!$count) var_dump($entry); + //$count++; + $gdtSum += $entry['connect']['gdt_entry']['gdt']; + } + $this->set('connectEntries', $connectEntries); } //echo "gdtSum: $gdtSum
"; $this->set('gdtSum', $gdtSum); $this->set('ownEntries', $ownEntries); - $this->set('connectEntries', $connectEntries); - $this->set('publishers', $publishers); + + if(isset($requestResult['data']['publishers'])) { + $publishers = $requestResult['data']['publishers']; + $this->set('publishers', $publishers); + } } else { $this->Flash->error(__('Fehler beim GDT Server, bitte abwarten oder den Admin benachrichtigen!')); } diff --git a/src/Template/StateBalances/overview_gdt.ctp b/src/Template/StateBalances/overview_gdt.ctp index 41cf4422c..fb6832caf 100644 --- a/src/Template/StateBalances/overview_gdt.ctp +++ b/src/Template/StateBalances/overview_gdt.ctp @@ -37,7 +37,7 @@ $this->assign('title', __('GDT Kontoübersicht')); - 0) :?> + 0) :?>
@@ -80,7 +80,7 @@ $this->assign('title', __('GDT Kontoübersicht'));
- 0) : ?> + 0) : ?>