diff --git a/src/Controller/DashboardController.php b/src/Controller/DashboardController.php index 775301567..da6e0e89f 100644 --- a/src/Controller/DashboardController.php +++ b/src/Controller/DashboardController.php @@ -29,7 +29,7 @@ class DashboardController extends AppController public function index() { $startTime = microtime(true); - $this->viewBuilder()->setLayout('frontend_ripple'); + $this->viewBuilder()->setLayout('frontend'); $session = $this->getRequest()->getSession(); $result = $this->requestLogin(); if($result !== true) { diff --git a/src/Controller/ElopageBuysController.php b/src/Controller/ElopageBuysController.php index 63e36cb7a..e097eddbb 100644 --- a/src/Controller/ElopageBuysController.php +++ b/src/Controller/ElopageBuysController.php @@ -34,7 +34,7 @@ class ElopageBuysController extends AppController public function statistics() { - $this->viewBuilder()->setLayout('frontend_ripple'); + $this->viewBuilder()->setLayout('frontend'); $connection = ConnectionManager::get('loginServer'); $dates = $connection->execute('SELECT success_date FROM elopage_buys group by CAST(success_date as DATE)')->fetchAll('assoc'); diff --git a/src/Controller/StateBalancesController.php b/src/Controller/StateBalancesController.php index a2cff0bde..f6f6b8118 100644 --- a/src/Controller/StateBalancesController.php +++ b/src/Controller/StateBalancesController.php @@ -13,7 +13,7 @@ use App\Controller\AppController; */ class StateBalancesController extends AppController { - + public function initialize() { parent::initialize(); @@ -35,11 +35,11 @@ class StateBalancesController extends AppController $this->set(compact('stateBalances')); } - - public function overview() + + public function overview() { $startTime = microtime(true); - $this->viewBuilder()->setLayout('frontend_ripple'); + $this->viewBuilder()->setLayout('frontend'); $session = $this->getRequest()->getSession(); $result = $this->requestLogin(); if($result !== true) { @@ -48,7 +48,7 @@ class StateBalancesController extends AppController $user = $session->read('StateUser'); // sendRequestGDT // listPerEmailApi - + //var_dump($user); $gdtSum = 0; if('admin' === $user['role']) { @@ -60,21 +60,21 @@ class StateBalancesController extends AppController } // // - + $creationsTable = TableRegistry::getTableLocator()->get('TransactionCreations'); $creationTransactions = $creationsTable ->find('all') ->where(['state_user_id' => $user['id']]) ->contain(['Transactions']); - + $transferTable = TableRegistry::getTableLocator()->get('TransactionSendCoins'); $transferTransactions = $transferTable ->find('all') ->where(['OR' => ['state_user_id' => $user['id'], 'receiver_user_id' => $user['id']]]) ->contain(['Transactions']); - + $involvedUserIds = []; - + foreach($transferTransactions as $sendCoins) { //var_dump($sendCoins); if($sendCoins->state_user_id != $user['id']) { @@ -83,7 +83,7 @@ class StateBalancesController extends AppController array_push($involvedUserIds, intval($sendCoins->receiver_user_id)); } } - + /*echo "state user from sendCoins: $sendCoins->state_user_id
"; echo "receiver user from sendCoins: $sendCoins->receiver_user_id
"; echo "user id from logged in user: ".$user['id']. '
'; @@ -95,7 +95,7 @@ class StateBalancesController extends AppController $involvedUserIds = array_flip($involvedUser_temp); $userTable = TableRegistry::getTableLocator()->get('StateUsers'); $involvedUser = $userTable->find('all', [ - 'contain' => false, + 'contain' => false, 'where' => ['id IN' => $involvedUserIds], 'fields' => ['id', 'first_name', 'last_name', 'email'] ]); @@ -104,27 +104,27 @@ class StateBalancesController extends AppController foreach($involvedUser as $involvedUser) { $involvedUserIndices[$involvedUser->id] = $involvedUser; } - + // sender or receiver when user has sended money // group name if creation // type: gesendet / empfangen / geschöpft // transaktion nr / id // date // balance - + $transactions = []; foreach($creationTransactions as $creation) { //var_dump($creation); array_push($transactions, [ - 'name' => 'Gradido Akademie', - 'type' => 'creation', - 'transaction_id' => $creation->transaction_id, - 'date' => $creation->transaction->received, + 'name' => 'Gradido Akademie', + 'type' => 'creation', + 'transaction_id' => $creation->transaction_id, + 'date' => $creation->transaction->received, 'balance' => $creation->amount, 'memo' => $creation->transaction->memo ]); } - + foreach($transferTransactions as $sendCoins) { $type = ''; $otherUser = null; @@ -145,18 +145,18 @@ class StateBalancesController extends AppController 'memo' => $sendCoins->transaction->memo ]); } - uasort($transactions, array($this, 'sortTransactions')); + uasort($transactions, array($this, 'sortTransactions')); $this->set('transactions', $transactions); $this->set('transactionExecutingCount', $session->read('Transaction.executing')); $this->set('balance', $session->read('StateUser.balance')); $this->set('timeUsed', microtime(true) - $startTime); $this->set('gdtSum', $gdtSum); } - + public function overviewGdt() { $startTime = microtime(true); - $this->viewBuilder()->setLayout('frontend_ripple'); + $this->viewBuilder()->setLayout('frontend'); $session = $this->getRequest()->getSession(); $result = $this->requestLogin(); if($result !== true) { @@ -167,33 +167,33 @@ class StateBalancesController extends AppController if('success' === $requestResult['state'] && 'success' === $requestResult['data']['state']) { //var_dump(array_keys($requestResult['data'])); $ownEntries = $requestResult['data']['ownEntries']; - - - + + + //$gdtEntries = $requestResult['data']['entries']; - + $gdtSum = 0; foreach($ownEntries as $i => $gdtEntry) { $gdtSum += $gdtEntry['gdt']; //echo "index: $i
"; //var_dump($gdtEntry); - + } 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']; + $gdtSum += $entry['connect']['gdt_entry']['gdt']; } $this->set('connectEntries', $connectEntries); } - + //echo "gdtSum: $gdtSum
"; $this->set('gdtSum', $gdtSum); $this->set('ownEntries', $ownEntries); - + if(isset($requestResult['data']['publishers'])) { $publishers = $requestResult['data']['publishers']; $this->set('publishers', $publishers); @@ -201,15 +201,15 @@ class StateBalancesController extends AppController } else { $this->Flash->error(__('Fehler beim GDT Server, bitte abwarten oder den Admin benachrichtigen!')); } - + } - + public function sortTransactions($a, $b) { if ($a['date'] == $b['date']) { return 0; } return ($a['date'] > $b['date']) ? -1 : 1; - + } /** diff --git a/src/Controller/StateUsersController.php b/src/Controller/StateUsersController.php index 1ef92801b..b24e1e7bb 100644 --- a/src/Controller/StateUsersController.php +++ b/src/Controller/StateUsersController.php @@ -73,7 +73,7 @@ class StateUsersController extends AppController { $startTime = microtime(true); I18n::setLocale('de_DE'); - $this->viewBuilder()->setLayout('frontend_ripple'); + $this->viewBuilder()->setLayout('frontend'); $session = $this->getRequest()->getSession(); $result = $this->requestLogin(); if($result !== true) { diff --git a/src/Controller/TransactionSendCoinsController.php b/src/Controller/TransactionSendCoinsController.php index de278b55e..598e378cf 100644 --- a/src/Controller/TransactionSendCoinsController.php +++ b/src/Controller/TransactionSendCoinsController.php @@ -124,7 +124,7 @@ class TransactionSendCoinsController extends AppController echo "locale: $locale, default locale: $defaultLocale
"; * */ $startTime = microtime(true); - $this->viewBuilder()->setLayout('frontend_ripple'); + $this->viewBuilder()->setLayout('frontend'); $session = $this->getRequest()->getSession(); $user = $session->read('StateUser'); // var_dump($user); @@ -266,7 +266,7 @@ class TransactionSendCoinsController extends AppController public function createRaw() { $startTime = microtime(true); - $this->viewBuilder()->setLayout('frontend_ripple'); + $this->viewBuilder()->setLayout('frontend'); $transferRawForm = new TransferRawForm(); $this->set('transferRawForm', $transferRawForm); diff --git a/src/Controller/UsersController.php b/src/Controller/UsersController.php index f4eff803a..2bc1ffeb9 100644 --- a/src/Controller/UsersController.php +++ b/src/Controller/UsersController.php @@ -29,7 +29,7 @@ class UsersController extends AppController public function statistics() { $startTime = microtime(true); - $this->viewBuilder()->setLayout('frontend_ripple'); + $this->viewBuilder()->setLayout('frontend'); $users = $this->Users->find('all')->select(['id']); //$newUsersThisMonth diff --git a/src/Template/Dashboard/index.ctp b/src/Template/Dashboard/index.ctp index 60f208f2e..ec4971657 100644 --- a/src/Template/Dashboard/index.ctp +++ b/src/Template/Dashboard/index.ctp @@ -13,14 +13,18 @@ $this->assign( 'title', __('Willkommen') . ', ' . $user['first_name'] . ' ' . $user['last_name'] . '!' ); +$this->assign( + 'header', + '

'.__('Willkommen') . ', ' . $user['first_name'] . ' ' . $user['last_name'] . '!

' +); ?> ms

Gradido ...

-
-
+
+
account_balance_wallet Html->link( __('Kontoübersicht'), @@ -28,7 +32,7 @@ $this->assign( ['class' => 'action-button-link'] );?>
-
+
account_balance Html->link( __('Überweisung'), @@ -45,11 +49,9 @@ $this->assign(

- -

Gradido ...

-
-
+
+
add_box Html->link( __('einzeln schöpfen'), @@ -57,7 +59,7 @@ $this->assign( ['class' => 'action-button-link'] );?>
-
+
library_add Html->link( __('viele schöpfen'), @@ -69,8 +71,8 @@ $this->assign(
Statistik -
-
+
+
cached Html->link( __('Anmeldungen'), @@ -78,32 +80,42 @@ $this->assign( ['class' => 'info-item-link'] );?>
-
+ +
error_outline Html->link( __('Fehler') . ' (' . $adminErrorCount . ')', ['controller' => 'AdminErrors'], ['class' => 'info-item-link']); ?>
+

Benutzer ...

- search - Html->link( - __('suchen'), - ['controller' => 'StateUsers', 'action' => 'search'], - ['class' => 'action-button'] - ); ?> - how_to_reg - - - - enhanced_encryption - - - +
+
+ search + Html->link( + __('suchen'), + ['controller' => 'StateUsers', 'action' => 'search'], + ['class' => 'info-item-link'] + ); ?> +
+
+ how_to_reg + + + +
+
+ enhanced_encryption + + + +
+
diff --git a/src/Template/Element/navi.ctp b/src/Template/Element/navi.ctp index 1e03e2ae1..fc9985037 100644 --- a/src/Template/Element/navi.ctp +++ b/src/Template/Element/navi.ctp @@ -48,5 +48,5 @@ if(intval($transactionPendings) > 0) { ?>
    - -
\ No newline at end of file + + diff --git a/src/Template/Layout/frontend.ctp b/src/Template/Layout/frontend.ctp index 45ef892f0..387409c0d 100644 --- a/src/Template/Layout/frontend.ctp +++ b/src/Template/Layout/frontend.ctp @@ -1,4 +1,4 @@ - getRequest()->getSession(); -$transactionPendings = $session->read('Transactions.pending'); -$errorCount = intval($session->read('StateUser.errorCount')); -$balance = $session->read('StateUser.balance'); -if(!isset($balance)) { - $balance = 0; -} +$GLOBALS["self"] = $this; + +//echo "balance: $balance
"; +//echo "transactions pending: " . $transactionPendings; ?> @@ -32,103 +29,72 @@ if(!isset($balance)) { fetch('title') ?> Html->meta('icon') ?> - Html->css('main.css') ?> - Html->script('fa-all.min.js') ?> + Html->css(['main.css']) ?> + Html->script(['basic']) ?> fetch('meta') ?> fetch('css') ?> fetch('script') ?>
-
- Html->image( - 'logo_schrift.png', - ['alt' => 'Gradido'], - ['class' => 'logo'] - ) - ?> -

fetch('title') ?>

- -
-
+ +
+ + + +
-
- Navigation -
-
-
    - 0) : ?> -
  • - Html->Link( - __('Fehler '). "($errorCount)", - ['controller' => 'StateErrors', - 'action' => 'showForUser'], - ['class' => 'grd-nav-bn grd-nav-bn-discard']) ?> -
    • - - -
  • - Html->link( - $this->element('printGradido', ['number' => $balance]), - ['controller' => 'StateBalances', 'action' => 'overview'], - ['class' => 'grd-nav-bn', 'escape' => false]) - ?> -
    • - -
  • - Html->link( - __('Startseite'), - ['controller' => 'Dashboard', 'action' => 'index'], - ['class' => 'grd-nav-bn'])?> -
    • -
  • - - - -
    • - 0) : ?> -
  • - - - -
    • - -
  • - -
    • - -
-
+ menu +
+ +
+ Flash->render() ?> +
+ element('navi_header'); ?> + +
+ element('navi'); ?>
-
Flash->render() ?>
- fetch('content') ?> +
+ Html->link(__('Startseite'), ['controller' => 'Dashboard']); ?> +
+ fetch('header')): ?> +
+ fetch('header') ?> +
+ +
+ fetch('content') ?> +
-
-

-

Alpha 0.21.KW21.05

-
-
- -

- ms -

- -
-
- Copyright © 2020 Gradido -
-
-
    +
    +
    +
    + Copyright © 2020 Gradido +
    +
    + + ms + +
    +
    +

    +

    Alpha 0.21.KW21.05

    +
- + \ No newline at end of file diff --git a/src/Template/Layout/frontend_ripple.ctp b/src/Template/Layout/frontend_ripple.ctp deleted file mode 100644 index 23d0b5708..000000000 --- a/src/Template/Layout/frontend_ripple.ctp +++ /dev/null @@ -1,98 +0,0 @@ -"; -//echo "transactions pending: " . $transactionPendings; -?> - - - - Html->charset() ?> - - - <?= $cakeDescription ?>: - <?= $this->fetch('title') ?> - - Html->meta('icon') ?> - Html->css(['main.css']) ?> - Html->script(['basic']) ?> - fetch('meta') ?> - fetch('css') ?> - fetch('script') ?> - - -
- -
- - - - -
- menu -
- -
- Flash->render() ?> -
- element('navi_header'); ?> - -
- element('navi'); ?> -
-
-
-
- Html->link(__('Startseite'), ['controller' => 'Dashboard']); ?> -
-
-

fetch('title') ?>

-
-
- fetch('content') ?> -
-
-
-
    -
    • -
    • -
-
-
- Copyright © 2020 Gradido -
-
- - ms - -
-
-

-

Alpha 0.21.KW21.05

-
-
- - \ No newline at end of file diff --git a/src/Template/StateBalances/add.ctp b/src/Template/StateBalances/add.ctp index c44ddda90..d19683ae2 100644 --- a/src/Template/StateBalances/add.ctp +++ b/src/Template/StateBalances/add.ctp @@ -14,6 +14,7 @@
Form->create($stateBalance) ?> + add
Form->create($stateBalance) ?> + edit

+ index diff --git a/src/Template/StateBalances/overview.ctp b/src/Template/StateBalances/overview.ctp index 514f327f8..dabe2449b 100644 --- a/src/Template/StateBalances/overview.ctp +++ b/src/Template/StateBalances/overview.ctp @@ -1,120 +1,104 @@ assign('title', __('Kontoübersicht')); + +$header = '

' . __('Aktueller Kontostand: ') . '

' . + '

' . $this->element('printGradido', ['number' => $balance]) . '

'; +if($gdtSum > 0) { + $header .= '

'.$this->Html->link( + $this->element('printGDT', ['number' => $gdtSum]), + ['action' => 'overview_gdt'], + ['escape' => false] + ).'

'; +} +$this->assign('header', $header); //var_dump($transactions); ?> -
-
-
-
-

-

element('printGradido', ['number' => $balance]) ?>

- 0) : ?> -

Html->link($this->element('printGDT', ['number' => $gdtSum]), ['action' => 'overview_gdt'], ['escape' => false]) ?>

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

Überweisungen

-
-
-
- - - - - - - - - - - 30) { - $memoShort = substr($memoShort, 0, 30) . '...'; - } - $cellColorClass = 'grd-success-color'; - if($send) { - $balance = -$balance; - $cellColorClass = 'grd-alert-color'; - } else if($transaction['type'] == 'creation') { - $cellColorClass = 'grd-orange-color'; - } - ?> - - - - - - - - - - -
- Html->image('50x50.png', ['class' => 'profile-img img-sm', 'alt' => 'profile image']) ?> - - - - - - - - - - -   - -   - -   - - - - 30): ?> - - - - - - nice() ?> element('printGradido', ['number' => $balance]) ?> - -
-
- -
-
+
+

Überweisungen

+ + + + + + + + + + + + 30) { + $memoShort = substr($memoShort, 0, 30) . '...'; + } + $cellColorClass = 'grd-success-color'; + if($send) { + $balance = -$balance; + $cellColorClass = 'grd-alert-color'; + } else if($transaction['type'] == 'creation') { + $cellColorClass = 'grd-orange-color'; + } + ?> + + + + + + + + + + +
+ Html->image('50x50.png', ['class' => 'profile-img img-sm', 'alt' => 'profile image']) ?> + + + + + + + + + + +   + +   + +   + + + + 30): ?> + + + + + + nice() ?> element('printGradido', ['number' => $balance]) ?> + +
-Html->css(['gdt.css']) ?> + + 0) : ?>