From d7ba4a5d8b149ba854a83e0022545f0a9819cee4 Mon Sep 17 00:00:00 2001
From: Dario Rekowski on RockPI <dario.rekowski@gmx.de>
Date: Thu, 19 Dec 2019 12:30:41 +0000
Subject: [PATCH] sort konto overview, update menu title, tooltip for memo
 every time not only by long memos

---
 src/Controller/AppController.php             |  2 +-
 src/Controller/StateBalancesController.php   | 22 ++++++++++++--------
 src/Template/Element/navi.ctp                |  7 ++++++-
 src/Template/Layout/frontend_ripple.ctp      |  2 +-
 src/Template/StateBalances/overview.ctp      | 10 +++++----
 src/Template/TransactionSendCoins/create.ctp |  4 ++--
 6 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/src/Controller/AppController.php b/src/Controller/AppController.php
index 4e3598c6c..20bdeed31 100644
--- a/src/Controller/AppController.php
+++ b/src/Controller/AppController.php
@@ -161,7 +161,7 @@ class AppController extends Controller
                   foreach($json['user'] as $key => $value) {
                     $session->write('StateUser.' . $key, $value );
                   }
-                  
+                  //var_dump($json);
                   $transactionPendings = $json['Transaction.pending'];
                   //echo "read transaction pending: $transactionPendings<br>";
                   $session->write('Transactions.pending', $transactionPendings);
diff --git a/src/Controller/StateBalancesController.php b/src/Controller/StateBalancesController.php
index 90944a268..0f81cf4c5 100644
--- a/src/Controller/StateBalancesController.php
+++ b/src/Controller/StateBalancesController.php
@@ -40,16 +40,11 @@ class StateBalancesController extends AppController
         $startTime = microtime(true);
         $this->viewBuilder()->setLayout('frontend_ripple');
         $session = $this->getRequest()->getSession();
-        $user = $session->read('StateUser');
-//        var_dump($user);
-        if(!$user) {
-          //return $this->redirect(Router::url('/', true) . 'account/', 303);
-          $result = $this->requestLogin();
-          if($result !== true) {
-            return $result;
-          }
-          $user = $session->read('StateUser');
+        $result = $this->requestLogin();
+        if($result !== true) {
+          return $result;
         }
+        $user = $session->read('StateUser');
         
         $creationsTable = TableRegistry::getTableLocator()->get('TransactionCreations');
         $creationTransactions = $creationsTable
@@ -135,10 +130,19 @@ class StateBalancesController extends AppController
              'memo' => $sendCoins->transaction->memo
           ]);
         }
+        uasort($transactions, array($this, 'sortTransactions')); 
         $this->set('transactions', $transactions);
         $this->set('balance', $session->read('StateUser.balance'));
         $this->set('timeUsed', microtime(true) - $startTime);
     }
+    
+    public function sortTransactions($a, $b) {
+      if ($a['date'] == $b['date']) {
+        return 0;
+      }
+      return ($a['date'] > $b['date']) ? -1 : 1;
+      
+    }
 
     /**
      * View method
diff --git a/src/Template/Element/navi.ctp b/src/Template/Element/navi.ctp
index 8bc8eb7e5..cb8caad69 100644
--- a/src/Template/Element/navi.ctp
+++ b/src/Template/Element/navi.ctp
@@ -1,5 +1,6 @@
 <?php 
 use Model\Navigation\NaviEntry;
+use Model\Navigation\NaviEntrySub;
 use Model\Navigation\NaviEntryAbsoluteLink;
 
 $session = $this->getRequest()->getSession();
@@ -20,7 +21,11 @@ $navi = [];
                  ->setIconColor('grd-alert-color');
   array_push($navi, $errorNaviEntry);
 }*/
-$balanceNaviEntry = new NaviEntry($this->element('printGradido', ['number' => $balance]), 'mdi-wallet-outline', 'StateBalances', 'overview');
+$balanceNaviEntry = new NaviEntry(
+        __('Kontoübersicht') . ' (' . $this->element('printGradido', ['number' => $balance]) . ')',
+        //__('Kontoübersicht'),
+        'mdi-wallet-outline', 'StateBalances', 'overview'
+);
 if($balance < 0 ) {
   //$balanceNaviEntry->setIconColor('grd-alert-color');
 } else if($balance > 0) {
diff --git a/src/Template/Layout/frontend_ripple.ctp b/src/Template/Layout/frontend_ripple.ctp
index 8677debbb..52d0eb43a 100644
--- a/src/Template/Layout/frontend_ripple.ctp
+++ b/src/Template/Layout/frontend_ripple.ctp
@@ -42,7 +42,7 @@ $GLOBALS["self"] = $this;
 <body class="header-fixed">
     <div class="versionstring dev-info">
         <p class="grd_small"><?= __("Community Server in Entwicklung") ?></p>
-        <p class="grd_small">Alpha 0.9.0</p>
+        <p class="grd_small">Alpha 0.10.0</p>
     </div>
     <nav class="t-header">
       <div class="t-header-brand-wrapper">
diff --git a/src/Template/StateBalances/overview.ctp b/src/Template/StateBalances/overview.ctp
index f46958085..0c399edc6 100644
--- a/src/Template/StateBalances/overview.ctp
+++ b/src/Template/StateBalances/overview.ctp
@@ -73,11 +73,13 @@ $this->assign('title', __('Kontoübersicht'));
                   <?php endif; ?>
                 </span>
               </td>
-              <td><?php if(strlen($transaction['memo']) > 30): ?>
-                <span data-toggle="tooltip" data-placement="bottom" title="<?= $transaction['memo'] ?>"><?= substr($memoShort, 0, 30) . '...' ?></span>
-              <?php else : ?>
+              <td><span data-toggle="tooltip" data-placement="bottom" title="<?= $transaction['memo'] ?>">
+                <?php if(strlen($transaction['memo']) > 30): ?>
+                  <?= substr($memoShort, 0, 30) . '...' ?>
+                <?php else : ?>
                   <?= $transaction['memo'] ?>
-              <?php endif;?>
+                <?php endif;?>
+                </span>
               </td>
               <td> <?= $transaction['date']->nice() ?> </td>  
               <td><?= $this->element('printGradido', ['number' => $balance]) ?></td>
diff --git a/src/Template/TransactionSendCoins/create.ctp b/src/Template/TransactionSendCoins/create.ctp
index 8eb8aa4c6..6a8870674 100644
--- a/src/Template/TransactionSendCoins/create.ctp
+++ b/src/Template/TransactionSendCoins/create.ctp
@@ -29,8 +29,8 @@ $this->loadHelper('Form', [
                 <?= $this->Form->control('amount', ['label' => __('Betrag in GDD')]) ?>
                 <?= $this->Form->control('memo', ['label' => __('Verwendungszweck')]) ?>
                 <?= $this->Form->control('email', ['label' => __('Empfänger'), 'placeholder' => 'E-Mail']) ?>
-                <?= $this->Form->button(__('Transaktion(n) abschließen'), ['name' => 'next', 'class' => 'btn btn-sm btn-primary']) ?>
-                <?= $this->Form->button(__('Weitere Transaktion erstellen'), ['name' => 'add', 'class' => 'btn btn-sm']) ?>
+                <?= $this->Form->button(__('Transaktion abschließen'), ['name' => 'next', 'class' => 'btn btn-sm btn-primary']) ?>
+                <!--<?= $this->Form->button(__('Weitere Transaktion erstellen'), ['name' => 'add', 'class' => 'btn btn-sm']) ?>-->
               <?= $this->Form->end() ?>
             </div>
           </div>