diff --git a/src/Controller/StateBalancesController.php b/src/Controller/StateBalancesController.php index a4a23cbf2..17b1d3f9f 100644 --- a/src/Controller/StateBalancesController.php +++ b/src/Controller/StateBalancesController.php @@ -23,12 +23,6 @@ class StateBalancesController extends AppController //$this->Auth->allow(['add', 'edit']); $this->Auth->allow(['overview', 'overviewGdt']); $this->loadComponent('JsonRequestClient'); - $this->set( - 'naviHierarchy', - (new NaviHierarchy())-> - add(new NaviHierarchyEntry(__('Startseite'), 'Dashboard', 'index', false))-> - add(new NaviHierarchyEntry(__('Kontoübersicht'), 'StateBalances', 'overview', true)) - ); } /** * Index method @@ -47,6 +41,12 @@ class StateBalancesController extends AppController public function overview() { + $this->set( + 'naviHierarchy', + (new NaviHierarchy())-> + add(new NaviHierarchyEntry(__('Startseite'), 'Dashboard', 'index', false))-> + add(new NaviHierarchyEntry(__('Kontoübersicht'), 'StateBalances', 'overview', true)) + ); $startTime = microtime(true); $this->viewBuilder()->setLayout('frontend'); $session = $this->getRequest()->getSession(); @@ -93,7 +93,7 @@ class StateBalancesController extends AppController //var_dump($sendCoins); if ($sendCoins->state_user_id != $user['id']) { array_push($involvedUserIds, intval($sendCoins->state_user_id)); - } else if ($sendCoins->receiver_user_id != $user['id']) { + } elseif ($sendCoins->receiver_user_id != $user['id']) { array_push($involvedUserIds, intval($sendCoins->receiver_user_id)); } } @@ -144,6 +144,7 @@ class StateBalancesController extends AppController $otherUser = null; if ($sendCoins->state_user_id == $user['id']) { $type = 'send'; + if(isset($involvedUserIndices[$sendCoins->receiver_user_id])) { $otherUser = $involvedUserIndices[$sendCoins->receiver_user_id]; } @@ -176,6 +177,12 @@ class StateBalancesController extends AppController public function overviewGdt() { + $this->set( + 'naviHierarchy', + (new NaviHierarchy())-> + add(new NaviHierarchyEntry(__('Startseite'), 'Dashboard', 'index', false))-> + add(new NaviHierarchyEntry(__('GDT Kontoübersicht'), 'StateBalances', 'overviewGdt', true)) + ); $startTime = microtime(true); $this->viewBuilder()->setLayout('frontend'); $session = $this->getRequest()->getSession(); @@ -188,10 +195,9 @@ class StateBalancesController extends AppController //var_dump($requestResult); if('success' === $requestResult['state'] && 'success' === $requestResult['data']['state']) { + //var_dump(array_keys($requestResult['data'])); $ownEntries = $requestResult['data']['ownEntries']; - - //$gdtEntries = $requestResult['data']['entries']; $gdtSum = 0; diff --git a/src/Template/StateBalances/overview_gdt.ctp b/src/Template/StateBalances/overview_gdt.ctp index 238b69e8b..85ecbfd50 100644 --- a/src/Template/StateBalances/overview_gdt.ctp +++ b/src/Template/StateBalances/overview_gdt.ctp @@ -9,192 +9,105 @@ use Cake\I18n\FrozenTime; function publisherLink($publisher, $the) { - /*if(is_a($publisher, 'App\Model\Entity\Publisher')) { - return $the->Html->link(h($publisher->email), ['controller' => 'GdtEntries', 'action' => 'viewPerEmail', $publisher->email], ['title' => $publisher->getNames()]); - } else { - return $the->Html->link(h($publisher), ['controller' => 'GdtEntries', 'action' => 'viewPerEmail', $publisher]); - }*/ if(is_array($publisher)) { return h($publisher['email']); } else { return h($publisher); } - //return json_encode($publisher); } $this->assign('title', __('GDT Kontoübersicht')); +$header = '

' . __('Zur Verfügung: ') . '

'; $gdtSumFromEmails = 0; foreach($gdtSumPerEmail as $email => $gdt) { $gdtSumFromEmails += $gdt; } -$ownEuroSum = 0; -$ownGdtSum = 0; -$publisherEuroSum = 0; -$publisherGdtSum = 0; +if($gdtSum > 0){ + $header .= '

'.$this->element('printGDT', ['number' => $gdtSumFromEmails]).'

'; +} +if($moreEntrysAsShown) { + $header .= ''. __('Nur die letzten 100 Einträge werden angezeigt!') . ''; +} +$this->assign('header', $header); + ?> - -
-
-
-
- overview -

- 0) : ?> -

element('printGDT', ['number' => $gdtSumFromEmails]) ?>

- - - - -
-
-
-
0) :?> -
-
-
-
-

-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- element('printEuro', ['number' => $entry['amount']]); ?> - element('printEuro', ['number' => $entry['amount2']]); - $ownEuroSum += $entry['amount2']; - } - ?> - - Number->format($entry['factor']) ?> - x - Number->format($entry['factor2']) ?> - - element('printGDT', ['number' => $entry['gdt']]) ?>
:element('printEuro', ['number' => $ownEuroSum]) ?>element('printGDT', ['number' => $ownGdtSum]) ?>
-
+
+

+
+
+
+
+
+
+
+
+ +
+
+
+
+
+ element('printEuro', ['number' => $entry['amount']]); ?> + element('printEuro', ['number' => $entry['amount2']]) ?> +
+
+ Number->format($entry['factor']) ?> + x + Number->format($entry['factor2']) ?> + +
+
element('printGDT', ['number' => $entry['gdt']]) ?>
+
+
0) : ?> -
-
-
-
-

-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- element('printEuro', ['number' => $gdtEntry['amount']]) ?> - element('printEuro', ['number' => $gdtEntry['amount2']]); - $publisherEuroSum += $gdtEntry['amount2']; - } - ?> - - Number->format($gdtEntry['factor']) ?> - x - Number->format($gdtEntry['factor2']) ?> - - element('printGDT', ['number' => $gdtEntry['gdt']]) ?>
:element('printEuro', ['number' => $publisherEuroSum]) ?>element('printGDT', ['number' => $publisherGdtSum]) ?>
-
+
+

+
+
+
+
+
+
+
+ +
+
+
+ + +
+
+ element('printEuro', ['number' => $gdtEntry['amount']]) ?> + element('printEuro', ['number' => $gdtEntry['amount2']]) ?> +
+
+ Number->format($gdtEntry['factor']) ?> + x + Number->format($gdtEntry['factor2']) ?> + +
+
element('printGDT', ['number' => $gdtEntry['gdt']]) ?>
+
+
-Html->css(['gdt.css']) ?> Html->script(['basic', 'popper.min', 'tippy-bundle.umd.min']) ?>