From c9a2bed4b531525202535b615117ab097de1de2f Mon Sep 17 00:00:00 2001
From: Dario Rekowski on RockPI <dario.rekowski@gmx.de>
Date: Wed, 25 Mar 2020 09:40:51 +0000
Subject: [PATCH] update state users view

---
 src/Controller/StateUsersController.php   |  2 +-
 src/Controller/TransactionsController.php |  2 +-
 src/Template/StateUsers/view.ctp          | 43 ++++++++++-------------
 3 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/src/Controller/StateUsersController.php b/src/Controller/StateUsersController.php
index 67a1341ec..77f466285 100644
--- a/src/Controller/StateUsersController.php
+++ b/src/Controller/StateUsersController.php
@@ -443,7 +443,7 @@ class StateUsersController extends AppController
     public function view($id = null)
     {
         $stateUser = $this->StateUsers->get($id, [
-            'contain' => ['StateBalances', 'TransactionCreations', 'TransactionSendCoins']
+            'contain' => ['StateBalances', 'TransactionCreations' => ['Transactions'], 'TransactionSendCoins' => ['Transactions']]
         ]);
 
         $this->set('stateUser', $stateUser);
diff --git a/src/Controller/TransactionsController.php b/src/Controller/TransactionsController.php
index afaf552f3..2f0bc2747 100644
--- a/src/Controller/TransactionsController.php
+++ b/src/Controller/TransactionsController.php
@@ -51,7 +51,7 @@ class TransactionsController extends AppController
     public function view($id = null)
     {
         $transaction = $this->Transactions->get($id, [
-            'contain' => ['StateGroups', 'TransactionTypes', 'StateCreated', 'TransactionCreations', 'TransactionGroupAddaddress', 'TransactionGroupAllowtrades', 'TransactionGroupCreates', 'TransactionSendCoins', 'TransactionSignatures']
+            'contain' => ['TransactionTypes', 'TransactionCreations', 'TransactionGroupAddaddress', 'TransactionGroupAllowtrades', 'TransactionGroupCreates', 'TransactionSendCoins', 'TransactionSignatures']
         ]);
 
         $this->set('transaction', $transaction);
diff --git a/src/Template/StateUsers/view.ctp b/src/Template/StateUsers/view.ctp
index 4ace43da0..a220724fc 100644
--- a/src/Template/StateUsers/view.ctp
+++ b/src/Template/StateUsers/view.ctp
@@ -22,24 +22,20 @@
     </ul>
 </nav>
 <div class="stateUsers view large-9 medium-8 columns content">
-    <h3><?= h($stateUser->id) ?></h3>
+  <h3><?= h($stateUser->first_name) ?> <?= h($stateUser->last_name) ?> &lt;<?= h($stateUser->email) ?>&gt;</h3>
     <div class="related">
         <h4><?= __('Related State Balances') ?></h4>
         <?php if (!empty($stateUser->state_balances)): ?>
         <table cellpadding="0" cellspacing="0">
             <tr>
-                <th scope="col"><?= __('Id') ?></th>
-                <th scope="col"><?= __('State User Id') ?></th>
-                <th scope="col"><?= __('Modified') ?></th>
+                <th scope="col"><?= __('Letztes Update') ?></th>
                 <th scope="col"><?= __('Amount') ?></th>
                 <th scope="col" class="actions"><?= __('Actions') ?></th>
             </tr>
             <?php foreach ($stateUser->state_balances as $stateBalances): ?>
             <tr>
-                <td><?= h($stateBalances->id) ?></td>
-                <td><?= h($stateBalances->state_user_id) ?></td>
                 <td><?= h($stateBalances->modified) ?></td>
-                <td><?= h($stateBalances->amount) ?></td>
+                <td><?= $this->element('printGradido', ['number' =>$stateBalances->amount]) ?></td>
                 <td class="actions">
                     <?= $this->Html->link(__('View'), ['controller' => 'StateBalances', 'action' => 'view', $stateBalances->id]) ?>
                     <?= $this->Html->link(__('Edit'), ['controller' => 'StateBalances', 'action' => 'edit', $stateBalances->id]) ?>
@@ -55,20 +51,20 @@
         <?php if (!empty($stateUser->transaction_creations)): ?>
         <table cellpadding="0" cellspacing="0">
             <tr>
-                <th scope="col"><?= __('Id') ?></th>
-                <th scope="col"><?= __('Transaction Id') ?></th>
-                <th scope="col"><?= __('State User Id') ?></th>
-                <th scope="col"><?= __('Amount') ?></th>
+                <th scope="col"><?= __('Transaction') ?></th>
+                <th scope="col"><?= __('Erhalten') ?></th>
+                <th scope="col"><?= __('Betrag') ?></th>
                 <th scope="col"><?= __('Ident Hash') ?></th>
                 <th scope="col" class="actions"><?= __('Actions') ?></th>
             </tr>
-            <?php foreach ($stateUser->transaction_creations as $transactionCreations): ?>
+            <?php foreach ($stateUser->transaction_creations as $transactionCreations): //var_dump($transactionCreations); 
+              $txHash = bin2hex(stream_get_contents($transactionCreations->transaction->tx_hash));
+              ?>
             <tr>
-                <td><?= h($transactionCreations->id) ?></td>
-                <td><?= h($transactionCreations->transaction_id) ?></td>
-                <td><?= h($transactionCreations->state_user_id) ?></td>
-                <td><?= h($transactionCreations->amount) ?></td>
-                <td><?= h($transactionCreations->ident_hash) ?></td>
+                <td><?= $this->Html->link(substr($txHash, 0, 12) . '...', ['controller' => 'Transactions', 'action' => 'view', $transactionCreations->transaction_id], ['title' => $txHash] ) ?></td>
+                <td><?= h($transactionCreations->transaction->received) ?></td>
+                <td><?= $this->element('printGradido', ['number' =>$transactionCreations->amount]) ?></td>
+                <td><?= h(substr(bin2hex(stream_get_contents($transactionCreations->ident_hash)), 0, 6)) ?></td>
                 <td class="actions">
                     <?= $this->Html->link(__('View'), ['controller' => 'TransactionCreations', 'action' => 'view', $transactionCreations->id]) ?>
                     <?= $this->Html->link(__('Edit'), ['controller' => 'TransactionCreations', 'action' => 'edit', $transactionCreations->id]) ?>
@@ -84,23 +80,22 @@
         <?php if (!empty($stateUser->transaction_send_coins)): ?>
         <table cellpadding="0" cellspacing="0">
             <tr>
-                <th scope="col"><?= __('Id') ?></th>
-                <th scope="col"><?= __('Transaction Id') ?></th>
-                <th scope="col"><?= __('State User Id') ?></th>
+                <th scope="col"><?= __('Transaction') ?></th>
                 <th scope="col"><?= __('Receiver Public Key') ?></th>
                 <th scope="col"><?= __('Receiver User Id') ?></th>
                 <th scope="col"><?= __('Amount') ?></th>
                 <th scope="col"><?= __('Sender Final Balance') ?></th>
                 <th scope="col" class="actions"><?= __('Actions') ?></th>
             </tr>
-            <?php foreach ($stateUser->transaction_send_coins as $transactionSendCoins): ?>
+            <?php foreach ($stateUser->transaction_send_coins as $transactionSendCoins):
+              $txHash = bin2hex(stream_get_contents($transactionSendCoins->transaction->tx_hash));
+              ?>
             <tr>
-                <td><?= h($transactionSendCoins->id) ?></td>
-                <td><?= h($transactionSendCoins->transaction_id) ?></td>
+                <td><?= $this->Html->link(substr($txHash, 0, 12), ['controller' => 'Transactions', 'action' => 'view', $transactionSendCoins->transaction_id]) ?></td>
                 <td><?= h($transactionSendCoins->state_user_id) ?></td>
                 <td><?= h($transactionSendCoins->receiver_public_key) ?></td>
                 <td><?= h($transactionSendCoins->receiver_user_id) ?></td>
-                <td><?= h($transactionSendCoins->amount) ?></td>
+                <td><?= $this->element('printGradido', ['number' =>$transactionSendCoins->amount]) ?></td>
                 <td><?= h($transactionSendCoins->sender_final_balance) ?></td>
                 <td class="actions">
                     <?= $this->Html->link(__('View'), ['controller' => 'TransactionSendCoins', 'action' => 'view', $transactionSendCoins->id]) ?>